evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: xhci: lock mutex on xhci_stop

Browse source 
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>
This commit is contained in:
Roger Quadros 2015-09-21 17:46:12 +03:00 • committed by Greg Kroah-Hartman
parent 2b7627b73e
commit 85ac90f895
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/host/xhci.c
View file

@ -677,8 +677,11 @@ void xhci_stop(struct usb_hcd *hcd)
u32 temp; u32 temp;
struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_hcd *xhci = hcd_to_xhci(hcd);
mutex_lock(&xhci->mutex);
if (!usb_hcd_is_primary_hcd(hcd)) { if (!usb_hcd_is_primary_hcd(hcd)) {
xhci_only_stop_hcd(xhci->shared_hcd); xhci_only_stop_hcd(xhci->shared_hcd);
mutex_unlock(&xhci->mutex);
return; return;
} }
@ -717,6 +720,7 @@ void xhci_stop(struct usb_hcd *hcd)
xhci_dbg_trace(xhci, trace_xhci_dbg_init, xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"xhci_stop completed - status = %x", "xhci_stop completed - status = %x",
readl(&xhci->op_regs->status)); readl(&xhci->op_regs->status));
mutex_unlock(&xhci->mutex);
} }
/* /*