aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-09-23 01:44:56 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:47:40 -0400
commita7f72abe8fac9b919135005e06216be8eef945a2 (patch)
tree2cc4ca35130559348fb2985224ccb6a570eb3e5a
parentf2cb36c1df427431a8c6096b4ad113df767c1bd9 (diff)
[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.c9
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)
762 if (uhci->hc_inaccessible) /* Dead or already suspended */ 762 if (uhci->hc_inaccessible) /* Dead or already suspended */
763 goto done; 763 goto done;
764 764
765#ifndef CONFIG_USB_SUSPEND
766 /* Otherwise this would never happen */
767 suspend_rh(uhci, UHCI_RH_SUSPENDED);
768#endif
769
770 if (uhci->rh_state > UHCI_RH_SUSPENDED) { 765 if (uhci->rh_state > UHCI_RH_SUSPENDED) {
771 dev_warn(uhci_dev(uhci), "Root hub isn't suspended!\n"); 766 dev_warn(uhci_dev(uhci), "Root hub isn't suspended!\n");
772 hcd->state = HC_STATE_RUNNING; 767 hcd->state = HC_STATE_RUNNING;
@@ -808,10 +803,6 @@ static int uhci_resume(struct usb_hcd *hcd)
808 check_and_reset_hc(uhci); 803 check_and_reset_hc(uhci);
809 configure_hc(uhci); 804 configure_hc(uhci);
810 805
811#ifndef CONFIG_USB_SUSPEND
812 /* Otherwise this would never happen */
813 wakeup_rh(uhci);
814#endif
815 if (uhci->rh_state == UHCI_RH_RESET) 806 if (uhci->rh_state == UHCI_RH_RESET)
816 suspend_rh(uhci, UHCI_RH_SUSPENDED); 807 suspend_rh(uhci, UHCI_RH_SUSPENDED);
817 808