[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(-)

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index b44094fcd779f9b6eb71da89a7bb1b94792fff3c..34c9dbc6a15685657bd446d5ac6eed5a20ee8cdd 100644 (file)
--- 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);