This makes the SL811 HCD use the driver model
wakeup flags.
- Dave
p.s. I'm not sending the OHCI or usbcore patches
quite yet ... need to test the OHCI stuff,
there's some non-obvious stuff there due to
the amd756 bug workarounds.
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).
Index: g26/drivers/usb/host/sl811-hcd.c
===================================================================
--- g26.orig/drivers/usb/host/sl811-hcd.c 2005-11-04 15:26:33.000000000 -0800
+++ g26/drivers/usb/host/sl811-hcd.c 2005-11-06 10:49:57.000000000 -0800
@@ -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;
}
@@ -1810,7 +1812,7 @@ sl811h_resume(struct device *dev)
* let's assume it'd only be powered to enable remote wakeup.
*/
if (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;
