diff options
author | Felipe Balbi <balbi@ti.com> | 2015-02-13 14:39:13 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-06 21:56:23 +0200 |
commit | 181d303cb1c16ef27ad48314675cbe47e6e45ffb (patch) | |
tree | e644dc4c8599fa31323d66d80387a7ad8a6fcb1d /drivers/usb/host | |
parent | 38faf1a5651345e72bf176a45877400329fc411d (diff) | |
download | lwn-181d303cb1c16ef27ad48314675cbe47e6e45ffb.tar.gz lwn-181d303cb1c16ef27ad48314675cbe47e6e45ffb.zip |
usb: host: xhci: use new USB_RESUME_TIMEOUT
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 9948890ef93e..bc7a886e3c36 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1697,7 +1697,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]); |