summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2015-02-13 15:38:33 -0600
committerJiri Slaby <jslaby@suse.cz>2015-05-04 11:50:00 +0200
commitac00ee011e26da21fc84b49a87a921098c842f91 (patch)
tree810a469e7b01bfdaeb391b287a87f6fad9d739cc
parent058b064116e332c1a94be9123325f608cf34d496 (diff)
downloadlwn-ac00ee011e26da21fc84b49a87a921098c842f91.tar.gz
lwn-ac00ee011e26da21fc84b49a87a921098c842f91.zip
usb: core: hub: use new USB_RESUME_TIMEOUT
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: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--drivers/usb/core/hub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 420bf9bb09e5..78141993dfd0 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3284,10 +3284,10 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
dev_dbg(hub->intfdev, "can't resume port %d, status %d\n",
port1, 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