diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-02-13 15:38:33 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-06 21:59:13 +0200 |
| commit | baf6b42332e11b3cbc8b2edd11dc0c6c7136f997 (patch) | |
| tree | b0b4b45757494698b89484cf61703f4ca4d9f410 | |
| parent | c1a8a92db2a9d1872da777ccc1a8b5780f04b2fc (diff) | |
| download | lwn-baf6b42332e11b3cbc8b2edd11dc0c6c7136f997.tar.gz lwn-baf6b42332e11b3cbc8b2edd11dc0c6c7136f997.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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/hub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index d2bd9d7c8f4b..1847a7d38026 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -3289,10 +3289,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 |