]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: isp1760: hcd: use new USB_RESUME_TIMEOUT
authorFelipe Balbi <balbi@ti.com>
Fri, 13 Feb 2015 21:04:06 +0000 (15:04 -0600)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 5 May 2015 10:09:50 +0000 (11:09 +0100)
commit 59c9904cce77b55892e15f40791f1e66e4d3a1e6 upstream.

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

Signed-off-by: Felipe Balbi <balbi@ti.com>
[ luis: backported to 3.16:
  - file rename: drivers/usb/isp1760/isp1760-hcd.c ->
    drivers/usb/host/isp1760-hcd.c ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/usb/host/isp1760-hcd.c

index 5ea7c6bdfd28bb2fb333b9391ed6fa1d912d72c0..6295b353bb6569d5eab14164e3f0633e4c11bfcb 100644 (file)
@@ -1895,7 +1895,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: