diff options
| author | David Brownell <david-b@pacbell.net> | 2005-09-23 07:44:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-29 01:47:40 +0200 |
| commit | a7f72abe8fac9b919135005e06216be8eef945a2 (patch) | |
| tree | 2cc4ca35130559348fb2985224ccb6a570eb3e5a | |
| parent | [PATCH] update PCI early-handoff handling for OHCI (diff) | |
| download | linux-a7f72abe8fac9b919135005e06216be8eef945a2.tar.xz linux-a7f72abe8fac9b919135005e06216be8eef945a2.zip | |
[PATCH] UHCI PM updates
This removes suspend and resume path recursion in UHCI.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/host/uhci-hcd.c | 9 ---------
1 file changed, 9 deletions(-)
| -rw-r--r-- | drivers/usb/host/uhci-hcd.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index b44094fcd779..34c9dbc6a156 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c @@ -762,11 +762,6 @@ static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message) if (uhci->hc_inaccessible) /* Dead or already suspended */ goto done; -#ifndef CONFIG_USB_SUSPEND - /* Otherwise this would never happen */ - suspend_rh(uhci, UHCI_RH_SUSPENDED); -#endif - if (uhci->rh_state > UHCI_RH_SUSPENDED) { dev_warn(uhci_dev(uhci), "Root hub isn't suspended!\n"); hcd->state = HC_STATE_RUNNING; @@ -808,10 +803,6 @@ static int uhci_resume(struct usb_hcd *hcd) check_and_reset_hc(uhci); configure_hc(uhci); -#ifndef CONFIG_USB_SUSPEND - /* Otherwise this would never happen */ - wakeup_rh(uhci); -#endif if (uhci->rh_state == UHCI_RH_RESET) suspend_rh(uhci, UHCI_RH_SUSPENDED); |