]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: core: hub: use new USB_RESUME_TIMEOUT
authorFelipe Balbi <balbi@ti.com>
Fri, 13 Feb 2015 21:38:33 +0000 (15:38 -0600)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 5 May 2015 10:09:50 +0000 (11:09 +0100)
commit bbc78c07a51f6fd29c227b1220a9016e585358ba 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>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
drivers/usb/core/hub.c

index 0e0e0354c52300d1b1f9da759feb3492f48eec4b..4209fc7d91c69adead1541fea07902455ef1c9f1 100644 (file)
@@ -3375,10 +3375,10 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
        if (status) {
                dev_dbg(&port_dev->dev, "can't resume, status %d\n", status);
        } else {
-               /* drive resume for at least 20 msec */
+               /* drive resume for USB_RESUME_TIMEOUT msec */
                dev_dbg(&udev->dev, "usb %sresume\n",
                                (PMSG_IS_AUTO(msg) ? "auto-" : ""));
-               msleep(25);
+               msleep(USB_RESUME_TIMEOUT);
 
                /* Virtual root hubs can trigger on GET_PORT_STATUS to
                 * stop resume signaling.  Then finish the resume