diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-10 13:45:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-10 13:45:27 +0200 |
| commit | c8d1bc12c7986c166bd3504213d9df2bc11ad7d6 (patch) | |
| tree | 9882ae7d9eb103c73029050d62232cd83328be52 /drivers/usb/host/fotg210-hcd.c | |
| parent | Merge 4.0-rc7 into usb-next (diff) | |
| parent | usb: core: hub: use new USB_RESUME_TIMEOUT (diff) | |
| download | linux-dev-c8d1bc12c7986c166bd3504213d9df2bc11ad7d6.tar.xz linux-dev-c8d1bc12c7986c166bd3504213d9df2bc11ad7d6.zip | |
Merge tag 'usb-for-v4.1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-testing
Felipe writes:
usb: generic resume timeout for v4.1
This part 2 pull request contains only the patches
which make sure everybody on linux uses the same
resume timeout value.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/host/fotg210-hcd.c')
| -rw-r--r-- | drivers/usb/host/fotg210-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c index af08ff12954d..000ed80ab592 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -1595,7 +1595,7 @@ static int fotg210_hub_control( /* resume signaling for 20 msec */ fotg210_writel(fotg210, temp | PORT_RESUME, status_reg); fotg210->reset_done[wIndex] = jiffies - + msecs_to_jiffies(20); + + msecs_to_jiffies(USB_RESUME_TIMEOUT); break; case USB_PORT_FEAT_C_SUSPEND: clear_bit(wIndex, &fotg210->port_c_suspend); |