This does the honors for isp116x ... I see you've
got some cleanups to that driver in the queue,
I hope they don't clash with this simple patch!
- Dave
This makes the ISP116x HCD use the driver model wakeup flags for its
controller, not the flags in the HCD glue (which will be removed).
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Index: g26/drivers/usb/host/isp116x-hcd.c
===================================================================
--- g26.orig/drivers/usb/host/isp116x-hcd.c 2005-11-06 10:56:39.000000000 -0800
+++ g26/drivers/usb/host/isp116x-hcd.c 2005-11-06 10:59:37.000000000 -0800
@@ -1176,7 +1176,7 @@ static int isp116x_bus_suspend(struct us
hcd->state = HC_STATE_QUIESCING;
val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE);
val |= HCCONTROL_USB_SUSPEND;
- if (hcd->remote_wakeup)
+ if (device_may_wakeup(&hcd->self.root_hub->dev))
val |= HCCONTROL_RWE;
/* Wait for usb transfers to finish */
mdelay(2);
@@ -1572,7 +1572,8 @@ static int isp116x_start(struct usb_hcd
val = 0;
if (board->remote_wakeup_enable) {
- hcd->can_wakeup = 1;
+ if (!device_can_wakeup(hcd->self.controller))
+ device_init_wakeup(hcd->self.controller, 1);
val |= RH_HS_DRWE;
}
isp116x_write_reg32(isp116x, HCRHSTATUS, val);
