From 0a1a97bc33f4f02839d38a1a6ea869159c52ac80 Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Fri, 11 Mar 2011 13:49:55 -0800 Subject: [PATCH] --- yaml --- r: 235423 b: refs/heads/master c: ad73dff32e04cad1ff2af89512bf489224b503cc h: refs/heads/master i: 235421: 5db9433e6a8b4572ba0b4848955c245dcf6af036 235419: 121f99b98fd8625523d4347216ce449b47eafe0f 235415: e964249d76c597c5468bdfe4c535e558feed2da1 235407: acb430398993f4601d61a9fdc4f652fb3fce3163 235391: 9f50e03a80051b6a6e37b7b1e76ade220a56663b v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-hub.c | 1 - trunk/drivers/usb/host/xhci.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index df4e478707c6..866b82f70bc4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4814030ce11f08350b7a91573487ad4b600dae34 +refs/heads/master: ad73dff32e04cad1ff2af89512bf489224b503cc diff --git a/trunk/drivers/usb/host/xhci-hub.c b/trunk/drivers/usb/host/xhci-hub.c index 004a46557f9c..43e0a099d634 100644 --- a/trunk/drivers/usb/host/xhci-hub.c +++ b/trunk/drivers/usb/host/xhci-hub.c @@ -732,7 +732,6 @@ int xhci_bus_resume(struct usb_hcd *hcd) (void) xhci_readl(xhci, &xhci->op_regs->command); xhci->next_statechange = jiffies + msecs_to_jiffies(5); - hcd->state = HC_STATE_RUNNING; /* re-enable irqs */ temp = xhci_readl(xhci, &xhci->op_regs->command); temp |= CMD_EIE; diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c index 63b8db5275e9..883b4c402c6a 100644 --- a/trunk/drivers/usb/host/xhci.c +++ b/trunk/drivers/usb/host/xhci.c @@ -452,7 +452,6 @@ int xhci_run(struct usb_hcd *hcd) xhci_writel(xhci, temp, &xhci->ir_set->irq_control); /* Set the HCD state before we enable the irqs */ - hcd->state = HC_STATE_RUNNING; temp = xhci_readl(xhci, &xhci->op_regs->command); temp |= (CMD_EIE); xhci_dbg(xhci, "// Enable interrupts, cmd = 0x%x.\n",