aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2015-02-13 15:57:54 -0500
committerFelipe Balbi <balbi@ti.com>2015-04-07 13:58:35 -0400
commit84c0d178eb9f3a3ae4d63dc97a440266cf17f7f5 (patch)
treebb03d09dfe2a44865cd10d37b475d93734b85ce8 /drivers/usb
parent595227db1f2d98bfc33f02a55842f268e12b247d (diff)
usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
Make sure we're using the new macro, so our resume signaling will always pass certification. Cc: <stable@vger.kernel.org> # v3.10+ Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/oxu210hp-hcd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index ef7efb278b15..28a2866b6b16 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -2500,11 +2500,12 @@ static irqreturn_t oxu210_hcd_irq(struct usb_hcd *hcd)
2500 || oxu->reset_done[i] != 0) 2500 || oxu->reset_done[i] != 0)
2501 continue; 2501 continue;
2502 2502
2503 /* start 20 msec resume signaling from this port, 2503 /* start USB_RESUME_TIMEOUT resume signaling from this
2504 * and make hub_wq collect PORT_STAT_C_SUSPEND to 2504 * port, and make hub_wq collect PORT_STAT_C_SUSPEND to
2505 * stop that signaling. 2505 * stop that signaling.
2506 */ 2506 */
2507 oxu->reset_done[i] = jiffies + msecs_to_jiffies(20); 2507 oxu->reset_done[i] = jiffies +
2508 msecs_to_jiffies(USB_RESUME_TIMEOUT);
2508 oxu_dbg(oxu, "port %d remote wakeup\n", i + 1); 2509 oxu_dbg(oxu, "port %d remote wakeup\n", i + 1);
2509 mod_timer(&hcd->rh_timer, oxu->reset_done[i]); 2510 mod_timer(&hcd->rh_timer, oxu->reset_done[i]);
2510 } 2511 }