From 9cc5e1f4f551fb18a65de74adf9935ccf0db5071 Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Mon, 27 Jul 2009 12:03:50 -0700 Subject: [PATCH] --- yaml --- r: 155960 b: refs/heads/master c: d3512f63494678dc58e44a20c56278718fd58969 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-hcd.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5319ab27b2a..ecf7e7363afe 100644 --- 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 index 764995fd59ef..8c3a074a95cd 100644 --- 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);