| Message ID | 1442846777-18389-8-git-send-email-mathias.nyman@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | 448116bfa856d3c076fa7178ed96661a008a5d45 |
| Headers | show
Return-Path: <patchwork-forward+bncBDPILVOKSELBB5VOQCYAKGQES3FPO4Q@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 7B33922B1E for <linaro@patches.linaro.org>; Mon, 21 Sep 2015 14:43:03 +0000 (UTC) Received: by wicuu12 with SMTP id uu12sf32058310wic.2 for <linaro@patches.linaro.org>; Mon, 21 Sep 2015 07:43:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=87xQcJENG5hhdvvPKlPqByGeAmb72U4gn/gLJa6xsYI=; b=jpVi+7UXMSNKShdjGkZnwPKjiyqTh8S9PD4I4smh67kLmEA5zUPui8mzb7M1e+I7uk I7Mmh/rbyD00x95Ey543KoyvKd2OWtdH/JbVIXDdNUE9iZUHm8ras0H9e5XHlAFc8Thh yKXoA9rEfiF2cVQ2bLzJfc1oaDw86rWOoNG1H7rKDXgUKUc1h1Vf9rlebqT+im+xUHQX SqLb5laFIWpU7tVti0PTSYpbrKn5IRhXYB4KhNzP2kKvsfHSRtQ2OhyslWPX8ccoP6qS Ng/9fhXx7cE9H7+2P972Nq6gFL6MJAB8ea+r32Aukxc7EDfHPIxg8/JhBU+AbjC6JlJL Ql7w== X-Gm-Message-State: ALoCoQmnG8gqFsIoTCapdowM4gOwRbEcQ/wm9OSaKYB13Eg7IP5yeczndfuqIw2wDF7+N5MuFE4d X-Received: by 10.152.29.10 with SMTP id f10mr3328087lah.1.1442846582802; Mon, 21 Sep 2015 07:43:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.10 with SMTP id z10ls319091lae.88.gmail; Mon, 21 Sep 2015 07:43:02 -0700 (PDT) X-Received: by 10.25.144.78 with SMTP id s75mr1496672lfd.116.1442846582693; Mon, 21 Sep 2015 07:43:02 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id kt7si12359314lac.88.2015.09.21.07.43.02 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Sep 2015 07:43:02 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lahg1 with SMTP id g1so69696661lah.1 for <patchwork-forward@linaro.org>; Mon, 21 Sep 2015 07:43:02 -0700 (PDT) X-Received: by 10.152.161.232 with SMTP id xv8mr7936031lab.32.1442846582532; Mon, 21 Sep 2015 07:43:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1753875lbq; Mon, 21 Sep 2015 07:43:01 -0700 (PDT) X-Received: by 10.66.194.138 with SMTP id hw10mr25549666pac.71.1442846581386; Mon, 21 Sep 2015 07:43:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yk2si38213838pac.192.2015.09.21.07.43.01; Mon, 21 Sep 2015 07:43:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756716AbbIUOmt (ORCPT <rfc822;patch@linaro.org> + 1 other); Mon, 21 Sep 2015 10:42:49 -0400 Received: from mga11.intel.com ([192.55.52.93]:48479 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756711AbbIUOmr (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 21 Sep 2015 10:42:47 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 21 Sep 2015 07:42:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,568,1437462000"; d="scan'208";a="809845999" Received: from mattu-haswell.fi.intel.com ([10.237.72.176]) by fmsmga002.fm.intel.com with ESMTP; 21 Sep 2015 07:42:22 -0700 From: Mathias Nyman <mathias.nyman@linux.intel.com> To: <gregkh@linuxfoundation.org> Cc: <linux-usb@vger.kernel.org>, Roger Quadros <rogerq@ti.com>, <stable@vger.kernel.org>, Mathias Nyman <mathias.nyman@linux.intel.com> Subject: [PATCH v2 7/9] usb: xhci: exit early in xhci_setup_device() if we're halted or dying Date: Mon, 21 Sep 2015 17:46:15 +0300 Message-Id: <1442846777-18389-8-git-send-email-mathias.nyman@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442846777-18389-1-git-send-email-mathias.nyman@linux.intel.com> References: <1442846777-18389-1-git-send-email-mathias.nyman@linux.intel.com> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index f881d5a..9957bd9 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -3788,6 +3788,9 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, mutex_lock(&xhci->mutex); + if (xhci->xhc_state) /* dying or halted */ + goto out; + if (!udev->slot_id) { xhci_dbg_trace(xhci, trace_xhci_dbg_address, "Bad Slot ID %d", udev->slot_id);