diff options
author | Roger Quadros <rogerq@ti.com> | 2015-09-21 17:46:13 +0300 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2015-10-28 16:37:56 +0100 |
commit | cd1f18abd84dc2b29b87c2f2c724b90ac663cab1 (patch) | |
tree | 1f56fe59d1609387ae2bed253a6411489b4dff1c /drivers | |
parent | c43eff0a37cc308eab7489701ced35afd4d491d9 (diff) |
usb: xhci: Clear XHCI_STATE_DYING on start
commit e5bfeab0ad515b4f6df39fe716603e9dc6d3dfd0 upstream.
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.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/xhci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 1dd08da9652a..319515406b4f 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -143,7 +143,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; } |