Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85ac90f8 authored by Roger Quadros's avatar Roger Quadros Committed by Greg Kroah-Hartman
Browse files

usb: xhci: lock mutex on xhci_stop 



Else it races with xhci_setup_device

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b7627b7

drivers/usb/host/xhci.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

}



/*