USB: xhci: Don't oops if the host doesn't halt.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/xhci-hcd.c b/drivers/usb/host/xhci-hcd.c
index 764995fd59ef84b70b64c98c90e63a90c8604015..8c3a074a95cdf6f14e4d0427c27d16384ed46031 100644 (file)
--- a/drivers/usb/host/xhci-hcd.c
+++ b/drivers/usb/host/xhci-hcd.c
@@ -103,7 +103,10 @@ int xhci_reset(struct xhci_hcd *xhci)
        u32 state;
 
        state = xhci_readl(xhci, &xhci->op_regs->status);
-       BUG_ON((state & STS_HALT) == 0);
+       if ((state & STS_HALT) == 0) {
+               xhci_warn(xhci, "Host controller not halted, aborting reset.\n");
+               return 0;
+       }
 
        xhci_dbg(xhci, "// Reset the HC\n");
        command = xhci_readl(xhci, &xhci->op_regs->command);