diff options
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 40e8240b7851..4e065e556e4b 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
| @@ -135,8 +135,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) | |||
| 135 | hcd->state = HC_STATE_QUIESCING; | 135 | hcd->state = HC_STATE_QUIESCING; |
| 136 | } | 136 | } |
| 137 | ehci->command = ehci_readl(ehci, &ehci->regs->command); | 137 | ehci->command = ehci_readl(ehci, &ehci->regs->command); |
| 138 | if (ehci->reclaim) | ||
| 139 | end_unlink_async(ehci); | ||
| 140 | ehci_work(ehci); | 138 | ehci_work(ehci); |
| 141 | 139 | ||
| 142 | /* Unlike other USB host controller types, EHCI doesn't have | 140 | /* Unlike other USB host controller types, EHCI doesn't have |
| @@ -180,6 +178,9 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) | |||
| 180 | ehci_halt (ehci); | 178 | ehci_halt (ehci); |
| 181 | hcd->state = HC_STATE_SUSPENDED; | 179 | hcd->state = HC_STATE_SUSPENDED; |
| 182 | 180 | ||
| 181 | if (ehci->reclaim) | ||
| 182 | end_unlink_async(ehci); | ||
| 183 | |||
| 183 | /* allow remote wakeup */ | 184 | /* allow remote wakeup */ |
| 184 | mask = INTR_MASK; | 185 | mask = INTR_MASK; |
| 185 | if (!device_may_wakeup(&hcd->self.root_hub->dev)) | 186 | if (!device_may_wakeup(&hcd->self.root_hub->dev)) |
