summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2015-09-21 17:46:13 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-09-21 22:48:53 -0700
commite5bfeab0ad515b4f6df39fe716603e9dc6d3dfd0 (patch)
tree832f561f1d204f5325a233754c2caf7f785867bd /drivers/usb
parent85ac90f8953a58f6a057b727bc9db97721e3fb8e (diff)
downloadlinux-e5bfeab0ad515b4f6df39fe716603e9dc6d3dfd0.tar.bz2
usb: xhci: Clear XHCI_STATE_DYING on start
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index f560c4100e2f..5fe24196c88b 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;
}