From e546b068c4e7eb81cc3de4af8ee5653023d8655c Mon Sep 17 00:00:00 2001 From: Roger Quadros Date: Wed, 12 Aug 2015 14:52:25 +0300 Subject: [PATCH] usb: xhci: lock mutex on xhci_stop Else it races with xhci_setup_device Signed-off-by: Roger Quadros Signed-off-by: Sekhar Nori --- 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 7ee1b5a6832f51..40d1e03121d185 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); } /*