diff mbox

[v2,5/9] usb: xhci: Clear XHCI_STATE_DYING on start

Message ID 1442846777-18389-6-git-send-email-mathias.nyman@linux.intel.com
State Accepted
Commit e5bfeab0ad515b4f6df39fe716603e9dc6d3dfd0
Headers show

Commit Message

Mathias Nyman Sept. 21, 2015, 2:46 p.m. UTC 
From: Roger Quadros <rogerq@ti.com>

For whatever reason if XHCI died in the previous instant
then it will never recover on the next xhci_start unless we
clear the DYING flag.

Cc: <stable@vger.kernel.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
 drivers/usb/host/xhci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index f560c41..5fe2419 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -146,7 +146,8 @@  static int xhci_start(struct xhci_hcd *xhci)
 				"waited %u microseconds.\n",
 				XHCI_MAX_HALT_USEC);
 	if (!ret)
-		xhci->xhc_state &= ~XHCI_STATE_HALTED;
+		xhci->xhc_state &= ~(XHCI_STATE_HALTED | XHCI_STATE_DYING);
+
 	return ret;
 }