---

yaml --- r: 155960 b: refs/heads/master c: d3512f6 h: refs/heads/master v: v3
git-mirror · Jul 28, 2009 · 9cc5e1f · 9cc5e1f
1 parent 8c2511c
commit 9cc5e1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66e49d8774fa03539713e8f91169c37c05df1e94
+refs/heads/master: d3512f63494678dc58e44a20c56278718fd58969
diff --git a/trunk/drivers/usb/host/xhci-hcd.c b/trunk/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);