Merge branch 'master' into gfs2

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index cadffacd945b..08d0472d4f57 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -238,6 +238,12 @@ static int ehci_pci_suspend(struct usb_hcd *hcd, pm_message_t message)
         writel (0, &ehci->regs->intr_enable);
         (void)readl(&ehci->regs->intr_enable);
 
+        /* make sure snapshot being resumed re-enumerates everything */
+        if (message.event == PM_EVENT_PRETHAW) {
+                ehci_halt(ehci);
+                ehci_reset(ehci);
+        }
+
         clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
  bail:
         spin_unlock_irqrestore (&ehci->lock, flags);
@@ -297,7 +303,7 @@ restart:
         /* emptying the schedule aborts any urbs */
         spin_lock_irq(&ehci->lock);
         if (ehci->reclaim)
-                ehci->reclaim_ready = 1;
+                end_unlink_async (ehci, NULL);
         ehci_work(ehci, NULL);
         spin_unlock_irq(&ehci->lock);
 
@@ -332,6 +338,7 @@ static const struct hc_driver ehci_pci_hc_driver = {
         .resume =               ehci_pci_resume,
 #endif
         .stop =                 ehci_stop,
+        .shutdown =             ehci_shutdown,
 
         /*
          * managing i/o requests and associated device resources
@@ -378,4 +385,5 @@ static struct pci_driver ehci_pci_driver = {
         .suspend =      usb_hcd_pci_suspend,
         .resume =       usb_hcd_pci_resume,
 #endif
+        .shutdown =     usb_hcd_pci_shutdown,
 };