aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2015-09-21 17:46:13 +0300
committerBen Hutchings <ben@decadent.org.uk>2015-10-13 03:46:10 +0100
commit88069fda208601be508fa1740919198bfef601a7 (patch)
treebd43c561bac864efa65c8d5b800ec5f01a9e7524
parentcce88b8251adf0d44733464703604dcb62ab38c3 (diff)
downloadkernel_samsung_smdk4412-88069fda208601be508fa1740919198bfef601a7.zip
kernel_samsung_smdk4412-88069fda208601be508fa1740919198bfef601a7.tar.gz
kernel_samsung_smdk4412-88069fda208601be508fa1740919198bfef601a7.tar.bz2
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-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 950a8cc..2f51dec 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -141,7 +141,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;
}