Merge branch 'master' into gfs2

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index b268537e389e..3732db7d68eb 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -135,6 +135,11 @@ static int ohci_pci_suspend (struct usb_hcd *hcd, pm_message_t message)
         }
         ohci_writel(ohci, OHCI_INTR_MIE, &ohci->regs->intrdisable);
         (void)ohci_readl(ohci, &ohci->regs->intrdisable);
+
+        /* make sure snapshot being resumed re-enumerates everything */
+        if (message.event == PM_EVENT_PRETHAW)
+                ohci_usb_reset(ohci);
+
         clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
  bail:
         spin_unlock_irqrestore (&ohci->lock, flags);
@@ -171,11 +176,14 @@ static const struct hc_driver ohci_pci_hc_driver = {
          */
         .reset =                ohci_pci_reset,
         .start =                ohci_pci_start,
+        .stop =                 ohci_stop,
+        .shutdown =             ohci_shutdown,
+
 #ifdef  CONFIG_PM
+        /* these suspend/resume entries are for upstream PCI glue ONLY */
         .suspend =              ohci_pci_suspend,
         .resume =               ohci_pci_resume,
 #endif
-        .stop =                 ohci_stop,
 
         /*
          * managing i/o requests and associated device resources
@@ -194,6 +202,7 @@ static const struct hc_driver ohci_pci_hc_driver = {
          */
         .hub_status_data =      ohci_hub_status_data,
         .hub_control =          ohci_hub_control,
+        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
         .bus_suspend =          ohci_bus_suspend,
         .bus_resume =           ohci_bus_resume,
@@ -224,6 +233,8 @@ static struct pci_driver ohci_pci_driver = {
         .suspend =      usb_hcd_pci_suspend,
         .resume =       usb_hcd_pci_resume,
 #endif
+
+        .shutdown =     usb_hcd_pci_shutdown,
 };