diff options
| author | David Brownell <david-b@pacbell.net> | 2005-11-07 15:38:24 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-04 13:48:30 -0800 |
| commit | 704aa0b7a9744d5f2b5c1fa68b826fcca73a2104 (patch) | |
| tree | 6a6bce0781c506bf44457514550006102b0f182d | |
| parent | baefbc39d8e23942cc10db92f5bc42e3476f6bc1 (diff) | |
| download | kernel_samsung_smdk4412-704aa0b7a9744d5f2b5c1fa68b826fcca73a2104.zip kernel_samsung_smdk4412-704aa0b7a9744d5f2b5c1fa68b826fcca73a2104.tar.gz kernel_samsung_smdk4412-704aa0b7a9744d5f2b5c1fa68b826fcca73a2104.tar.bz2 | |
[PATCH] USB: wakeup flag updates (3/3) isp116x-hcd
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 <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 342cfad..c95af11 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c @@ -1378,7 +1378,8 @@ static int isp116x_start(struct usb_hcd *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); @@ -1428,7 +1429,7 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) 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); |