[PATCH] USB: central handling for host controllers that were reset during suspend/resume

This patch (as515b) adds a routine to usbcore to simplify handling of
host controllers that lost power or were reset during suspend/resume.
The new core routine marks all the child devices of the root hub as
NOTATTACHED and tells khubd to disconnect the device structures as soon
as possible.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index e3af3ac4416a..a4b12404ae08 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -795,7 +795,6 @@ static int ohci_restart (struct ohci_hcd *ohci)
         int temp;
         int i;
         struct urb_priv *priv;
-        struct usb_device *root = ohci_to_hcd(ohci)->self.root_hub;
 
         /* mark any devices gone, so they do nothing till khubd disconnects.
          * recycle any "live" eds/tds (and urbs) right away.
@@ -804,11 +803,7 @@ static int ohci_restart (struct ohci_hcd *ohci)
          */ 
         spin_lock_irq(&ohci->lock);
         disable (ohci);
-        for (i = 0; i < root->maxchild; i++) {
-                if (root->children [i])
-                        usb_set_device_state (root->children[i],
-                                USB_STATE_NOTATTACHED);
-        }
+        usb_root_hub_lost_power(ohci_to_hcd(ohci)->self.root_hub);
         if (!list_empty (&ohci->pending))
                 ohci_dbg(ohci, "abort schedule...\n");
         list_for_each_entry (priv, &ohci->pending, pending) {