diff options
-rw-r--r-- | drivers/usb/host/xhci-hub.c | 1 | ||||
-rw-r--r-- | drivers/usb/host/xhci.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 004a46557f9c..43e0a099d634 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c | |||
@@ -732,7 +732,6 @@ int xhci_bus_resume(struct usb_hcd *hcd) | |||
732 | (void) xhci_readl(xhci, &xhci->op_regs->command); | 732 | (void) xhci_readl(xhci, &xhci->op_regs->command); |
733 | 733 | ||
734 | xhci->next_statechange = jiffies + msecs_to_jiffies(5); | 734 | xhci->next_statechange = jiffies + msecs_to_jiffies(5); |
735 | hcd->state = HC_STATE_RUNNING; | ||
736 | /* re-enable irqs */ | 735 | /* re-enable irqs */ |
737 | temp = xhci_readl(xhci, &xhci->op_regs->command); | 736 | temp = xhci_readl(xhci, &xhci->op_regs->command); |
738 | temp |= CMD_EIE; | 737 | temp |= CMD_EIE; |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 63b8db5275e9..883b4c402c6a 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
@@ -452,7 +452,6 @@ int xhci_run(struct usb_hcd *hcd) | |||
452 | xhci_writel(xhci, temp, &xhci->ir_set->irq_control); | 452 | xhci_writel(xhci, temp, &xhci->ir_set->irq_control); |
453 | 453 | ||
454 | /* Set the HCD state before we enable the irqs */ | 454 | /* Set the HCD state before we enable the irqs */ |
455 | hcd->state = HC_STATE_RUNNING; | ||
456 | temp = xhci_readl(xhci, &xhci->op_regs->command); | 455 | temp = xhci_readl(xhci, &xhci->op_regs->command); |
457 | temp |= (CMD_EIE); | 456 | temp |= (CMD_EIE); |
458 | xhci_dbg(xhci, "// Enable interrupts, cmd = 0x%x.\n", | 457 | xhci_dbg(xhci, "// Enable interrupts, cmd = 0x%x.\n", |