Commit 704aa0b7 authored by David Brownell's avatar David Brownell Committed by Greg Kroah-Hartman
Browse files

[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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent baefbc39
...@@ -1378,7 +1378,8 @@ static int isp116x_start(struct usb_hcd *hcd) ...@@ -1378,7 +1378,8 @@ static int isp116x_start(struct usb_hcd *hcd)
val = 0; val = 0;
if (board->remote_wakeup_enable) { 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; val |= RH_HS_DRWE;
} }
isp116x_write_reg32(isp116x, HCRHSTATUS, val); isp116x_write_reg32(isp116x, HCRHSTATUS, val);
...@@ -1428,7 +1429,7 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd) ...@@ -1428,7 +1429,7 @@ static int isp116x_bus_suspend(struct usb_hcd *hcd)
hcd->state = HC_STATE_QUIESCING; hcd->state = HC_STATE_QUIESCING;
val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE); val &= (~HCCONTROL_HCFS & ~HCCONTROL_RWE);
val |= HCCONTROL_USB_SUSPEND; val |= HCCONTROL_USB_SUSPEND;
if (hcd->remote_wakeup) if (device_may_wakeup(&hcd->self.root_hub->dev))
val |= HCCONTROL_RWE; val |= HCCONTROL_RWE;
/* Wait for usb transfers to finish */ /* Wait for usb transfers to finish */
mdelay(2); mdelay(2);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment