diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-02-13 14:57:54 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-13 05:16:59 -0700 |
| commit | 86e8c6698d9e7b9bbc6900ae63cfed275b2fcdb1 (patch) | |
| tree | f88b35e7bd71e354316a85c2dec5644f0849941d | |
| parent | 0e0fc26cb3ebaf37450eae399c92601d21388f70 (diff) | |
| download | linux-stable-86e8c6698d9e7b9bbc6900ae63cfed275b2fcdb1.tar.gz linux-stable-86e8c6698d9e7b9bbc6900ae63cfed275b2fcdb1.tar.bz2 linux-stable-86e8c6698d9e7b9bbc6900ae63cfed275b2fcdb1.zip | |
usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
commit 84c0d178eb9f3a3ae4d63dc97a440266cf17f7f5 upstream.
Make sure we're using the new macro, so our
resume signaling will always pass certification.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/host/oxu210hp-hcd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c index e07248b6ab67..1b1e6e0d9270 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) || oxu->reset_done[i] != 0) continue; - /* start 20 msec resume signaling from this port, - * and make khubd collect PORT_STAT_C_SUSPEND to + /* start USB_RESUME_TIMEOUT resume signaling from this + * port, and make hub_wq collect PORT_STAT_C_SUSPEND to * stop that signaling. */ - oxu->reset_done[i] = jiffies + msecs_to_jiffies(20); + oxu->reset_done[i] = jiffies + + msecs_to_jiffies(USB_RESUME_TIMEOUT); oxu_dbg(oxu, "port %d remote wakeup\n", i + 1); mod_timer(&hcd->rh_timer, oxu->reset_done[i]); } |