Skip to content

Commit

Permalink
[PATCH] USB: wakeup flag updates (1/3) sl811-hcd
Browse files Browse the repository at this point in the history
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: Greg Kroah-Hartman <gregkh@suse.de>

 drivers/usb/host/sl811-hcd.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
  • Loading branch information
David Brownell authored and Greg Kroah-Hartman committed Jan 4, 2006
1 parent d97cc2f commit 0c8624f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/usb/host/sl811-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0c8624f

Please sign in to comment.