diff options
Diffstat (limited to 'drivers/usb/core/hcd.c')
-rw-r--r-- | drivers/usb/core/hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 5cca00a6d09d..b5c965c031f9 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -1945,7 +1945,6 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) | |||
1945 | 1945 | ||
1946 | dev_dbg(&rhdev->dev, "usb %s%s\n", | 1946 | dev_dbg(&rhdev->dev, "usb %s%s\n", |
1947 | (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume"); | 1947 | (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume"); |
1948 | clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); | ||
1949 | if (!hcd->driver->bus_resume) | 1948 | if (!hcd->driver->bus_resume) |
1950 | return -ENOENT; | 1949 | return -ENOENT; |
1951 | if (hcd->state == HC_STATE_RUNNING) | 1950 | if (hcd->state == HC_STATE_RUNNING) |
@@ -1953,6 +1952,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) | |||
1953 | 1952 | ||
1954 | hcd->state = HC_STATE_RESUMING; | 1953 | hcd->state = HC_STATE_RESUMING; |
1955 | status = hcd->driver->bus_resume(hcd); | 1954 | status = hcd->driver->bus_resume(hcd); |
1955 | clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); | ||
1956 | if (status == 0) { | 1956 | if (status == 0) { |
1957 | /* TRSMRCY = 10 msec */ | 1957 | /* TRSMRCY = 10 msec */ |
1958 | msleep(10); | 1958 | msleep(10); |