Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f72abe authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

[PATCH] UHCI PM updates 



This removes suspend and resume path recursion in UHCI.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

 drivers/usb/host/uhci-hcd.c |    9 ---------
 1 file changed, 9 deletions(-)
parent f2cb36c1

drivers/usb/host/uhci-hcd.c

+0 −9
Original line number Diff line number Diff line
@@ -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);