Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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)
                 hcd->state = HC_STATE_QUIESCING;
         }
         ehci->command = ehci_readl(ehci, &ehci->regs->command);
-        if (ehci->reclaim)
-                end_unlink_async(ehci);
         ehci_work(ehci);
 
         /* Unlike other USB host controller types, EHCI doesn't have
@@ -180,6 +178,9 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
         ehci_halt (ehci);
         hcd->state = HC_STATE_SUSPENDED;
 
+        if (ehci->reclaim)
+                end_unlink_async(ehci);
+
         /* allow remote wakeup */
         mask = INTR_MASK;
         if (!device_may_wakeup(&hcd->self.root_hub->dev))