diff options
| author | Roger Quadros | 2015-09-21 16:46:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-09-22 07:48:53 +0200 |
| commit | 85ac90f8953a58f6a057b727bc9db97721e3fb8e (patch) | |
| tree | 6351a1f324c9750530f4acfebfb1f7914cd32080 /drivers/usb/host | |
| parent | xhci: Move xhci_pme_quirk() behind #ifdef CONFIG_PM (diff) | |
| download | kernel-qcow2-linux-85ac90f8953a58f6a057b727bc9db97721e3fb8e.tar.gz kernel-qcow2-linux-85ac90f8953a58f6a057b727bc9db97721e3fb8e.tar.xz kernel-qcow2-linux-85ac90f8953a58f6a057b727bc9db97721e3fb8e.zip | |
usb: xhci: lock mutex on xhci_stop
Else it races with xhci_setup_device
Cc: <stable@vger.kernel.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/xhci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 6b0f4a47e402..f560c4100e2f 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); } /* |