]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: host: xhci: use new USB_RESUME_TIMEOUT
authorFelipe Balbi <balbi@ti.com>
Fri, 13 Feb 2015 20:39:13 +0000 (14:39 -0600)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 5 May 2015 10:09:44 +0000 (11:09 +0100)
commit b9e451885deb6262dbaf5cd14aa77d192d9ac759 upstream.

Make sure we're using the new macro, so our
resume signaling will always pass certification.

Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/usb/host/xhci-ring.c

index 5e4e1d1d7de755604a6059fd094df6668d0712f3..f176280e2fcf7aa67f445026252c6caeead393ac 100644 (file)
@@ -1611,7 +1611,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
                } else {
                        xhci_dbg(xhci, "resume HS port %d\n", port_id);
                        bus_state->resume_done[faked_port_index] = jiffies +
-                               msecs_to_jiffies(20);
+                               msecs_to_jiffies(USB_RESUME_TIMEOUT);
                        set_bit(faked_port_index, &bus_state->resuming_ports);
                        mod_timer(&hcd->rh_timer,
                                  bus_state->resume_done[faked_port_index]);