diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2005-11-14 11:45:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-04 16:48:31 -0500 |
commit | 1c50c317e2e7f15427149cbc216a63366468710e (patch) | |
tree | d48dc0b03090e89c644f73f9997b4f70b6ec9b41 /drivers/usb/host/uhci-hcd.c | |
parent | 8364d6b0be2dbbf162c6aea79615b5025a0d67c2 (diff) |
[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>
Diffstat (limited to 'drivers/usb/host/uhci-hcd.c')
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 1c0394cb3c89..071fab6b6475 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -748,8 +748,12 @@ static int uhci_resume(struct usb_hcd *hcd) | |||
748 | check_and_reset_hc(uhci); | 748 | check_and_reset_hc(uhci); |
749 | configure_hc(uhci); | 749 | configure_hc(uhci); |
750 | 750 | ||
751 | if (uhci->rh_state == UHCI_RH_RESET) | 751 | if (uhci->rh_state == UHCI_RH_RESET) { |
752 | |||
753 | /* The controller had to be reset */ | ||
754 | usb_root_hub_lost_power(hcd->self.root_hub); | ||
752 | suspend_rh(uhci, UHCI_RH_SUSPENDED); | 755 | suspend_rh(uhci, UHCI_RH_SUSPENDED); |
756 | } | ||
753 | 757 | ||
754 | spin_unlock_irq(&uhci->lock); | 758 | spin_unlock_irq(&uhci->lock); |
755 | 759 | ||