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

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

[PATCH] USB: wakeup flag updates (1/3) sl811-hcd 



This makes the SL811 HCD use the driver model wakeup flags for its
controller, not the flags in the HCD glue (which will be removed).

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

 drivers/usb/host/sl811-hcd.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
parent d97cc2f2

drivers/usb/host/sl811-hcd.c

+4 −2
Original line number Diff line number Diff line
@@ -1581,7 +1581,9 @@ sl811h_start(struct usb_hcd *hcd) 
	hcd->state = HC_STATE_RUNNING;



	if (sl811->board) {

		hcd->can_wakeup = sl811->board->can_wakeup;

		if (!device_can_wakeup(hcd->self.controller))

			device_init_wakeup(hcd->self.controller,

				sl811->board->can_wakeup);

		hcd->power_budget = sl811->board->power * 2;

	}
@@ -1805,7 +1807,7 @@ sl811h_resume(struct platform_device *dev) 
	 * let's assume it'd only be powered to enable remote wakeup.

	 */

	if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND

			|| !hcd->can_wakeup) {

			|| !device_can_wakeup(&hcd->self.root_hub->dev)) {

		sl811->port1 = 0;

		port_power(sl811, 1);

		return 0;