summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2015-02-13 14:39:13 -0600
committerFelipe Balbi <balbi@ti.com>2015-04-07 12:58:35 -0500
commitb9e451885deb6262dbaf5cd14aa77d192d9ac759 (patch)
treec32f33b4b1bbd367906777c917ecd24e9d6c28a7 /drivers/usb
parent62f0342de1f012f3e90607d39e20fce811391169 (diff)
downloadtalos-obmc-linux-b9e451885deb6262dbaf5cd14aa77d192d9ac759.tar.gz
talos-obmc-linux-b9e451885deb6262dbaf5cd14aa77d192d9ac759.zip
usb: host: xhci: 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+ Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci-ring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 5fb66db89e05..23304817a89a 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1574,7 +1574,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]);
OpenPOWER on IntegriCloud