usb: xhci: lock mutex on xhci_stop
authorRoger Quadros <rogerq@ti.com>
Mon, 21 Sep 2015 14:46:12 +0000 (17:46 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Sep 2015 05:48:53 +0000 (22:48 -0700)
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>
drivers/usb/host/xhci.c

index 6b0f4a47e4021d83e01fb76a0a1aa18d6b3ca793..f560c4100e2fa3d4a680c53e80f133038cb7b12a 100644 (file)
@@ -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);
 }
 
 /*