浏览代码

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>
Roger Quadros 10 年之前
父节点
当前提交
85ac90f895
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      drivers/usb/host/xhci.c

+ 4 - 0
drivers/usb/host/xhci.c

@@ -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);
 }
 }
 
 
 /*
 /*