]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
authorFelipe Balbi <balbi@ti.com>
Fri, 13 Feb 2015 20:57:54 +0000 (14:57 -0600)
committerJiri Slaby <jslaby@suse.cz>
Fri, 15 May 2015 07:10:53 +0000 (09:10 +0200)
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: Jiri Slaby <jslaby@suse.cz>
drivers/usb/host/oxu210hp-hcd.c

index 4a6df2d8f902f04951cedab23de2ebf49301f786..8fb603f337299f56ea4a92f50d06dc16bf124222 100644 (file)
@@ -2497,11 +2497,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]);
                }