Return-Path: Received: from mga09.intel.com ([134.134.136.24]:20015 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756392AbbIUOmX (ORCPT ); Mon, 21 Sep 2015 10:42:23 -0400 From: Mathias Nyman To: Cc: , Roger Quadros , , Mathias Nyman Subject: [PATCH v2 4/9] usb: xhci: lock mutex on xhci_stop Date: Mon, 21 Sep 2015 17:46:12 +0300 Message-Id: <1442846777-18389-5-git-send-email-mathias.nyman@linux.intel.com> 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 List-ID: From: Roger Quadros Else it races with xhci_setup_device Cc: Signed-off-by: Roger Quadros Signed-off-by: Mathias Nyman --- drivers/usb/host/xhci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 6b0f4a4..f560c41 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -677,8 +677,11 @@ void xhci_stop(struct usb_hcd *hcd) u32 temp; struct xhci_hcd *xhci = hcd_to_xhci(hcd); + mutex_lock(&xhci->mutex); + if (!usb_hcd_is_primary_hcd(hcd)) { xhci_only_stop_hcd(xhci->shared_hcd); + mutex_unlock(&xhci->mutex); return; } @@ -717,6 +720,7 @@ void xhci_stop(struct usb_hcd *hcd) xhci_dbg_trace(xhci, trace_xhci_dbg_init, "xhci_stop completed - status = %x", readl(&xhci->op_regs->status)); + mutex_unlock(&xhci->mutex); } /* -- 1.9.1