aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2005-11-07 18:31:25 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-04 16:48:30 -0500
commit0c8624f91d91df7cdeb9b2dace3269b8788c845f (patch)
treee836d3ac3e1eb623093d47c678ed8e684a79b7ce /drivers/usb
parentd97cc2f2e938547a47daef29bc10ab38600a3310 (diff)
[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: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/host/sl811-hcd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/sl811-hcd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index a7722a6a5a5b..5a28e6115892 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1581,7 +1581,9 @@ sl811h_start(struct usb_hcd *hcd)
1581 hcd->state = HC_STATE_RUNNING; 1581 hcd->state = HC_STATE_RUNNING;
1582 1582
1583 if (sl811->board) { 1583 if (sl811->board) {
1584 hcd->can_wakeup = sl811->board->can_wakeup; 1584 if (!device_can_wakeup(hcd->self.controller))
1585 device_init_wakeup(hcd->self.controller,
1586 sl811->board->can_wakeup);
1585 hcd->power_budget = sl811->board->power * 2; 1587 hcd->power_budget = sl811->board->power * 2;
1586 } 1588 }
1587 1589
@@ -1805,7 +1807,7 @@ sl811h_resume(struct platform_device *dev)
1805 * let's assume it'd only be powered to enable remote wakeup. 1807 * let's assume it'd only be powered to enable remote wakeup.
1806 */ 1808 */
1807 if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND 1809 if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND
1808 || !hcd->can_wakeup) { 1810 || !device_can_wakeup(&hcd->self.root_hub->dev)) {
1809 sl811->port1 = 0; 1811 sl811->port1 = 0;
1810 port_power(sl811, 1); 1812 port_power(sl811, 1);
1811 return 0; 1813 return 0;