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/isp1760 | |
| parent | b7a4abb67416aa07cd65446dd39e64525ccfe8e5 (diff) | |
| parent | bbc78c07a51f6fd29c227b1220a9016e585358ba (diff) | |
| download | blackbird-op-linux-c8d1bc12c7986c166bd3504213d9df2bc11ad7d6.tar.gz blackbird-op-linux-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/isp1760')
| -rw-r--r-- | drivers/usb/isp1760/isp1760-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/isp1760/isp1760-hcd.c b/drivers/usb/isp1760/isp1760-hcd.c index 9e23153c3c2e..ac31d19cc54b 100644 --- a/drivers/usb/isp1760/isp1760-hcd.c +++ b/drivers/usb/isp1760/isp1760-hcd.c @@ -1869,7 +1869,7 @@ static int isp1760_hub_control(struct usb_hcd *hcd, u16 typeReq, reg_write32(hcd->regs, HC_PORTSC1, temp | PORT_RESUME); priv->reset_done = jiffies + - msecs_to_jiffies(20); + msecs_to_jiffies(USB_RESUME_TIMEOUT); } break; case USB_PORT_FEAT_C_SUSPEND: |
