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 d0b782c4523a..24765fd6cf12 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
@@ -1973,7 +1973,6 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) | |||
1973 | 1973 | ||
1974 | dev_dbg(&rhdev->dev, "usb %s%s\n", | 1974 | dev_dbg(&rhdev->dev, "usb %s%s\n", |
1975 | (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume"); | 1975 | (msg.event & PM_EVENT_AUTO ? "auto-" : ""), "resume"); |
1976 | clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); | ||
1977 | if (!hcd->driver->bus_resume) | 1976 | if (!hcd->driver->bus_resume) |
1978 | return -ENOENT; | 1977 | return -ENOENT; |
1979 | if (hcd->state == HC_STATE_RUNNING) | 1978 | if (hcd->state == HC_STATE_RUNNING) |
@@ -1981,6 +1980,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) | |||
1981 | 1980 | ||
1982 | hcd->state = HC_STATE_RESUMING; | 1981 | hcd->state = HC_STATE_RESUMING; |
1983 | status = hcd->driver->bus_resume(hcd); | 1982 | status = hcd->driver->bus_resume(hcd); |
1983 | clear_bit(HCD_FLAG_WAKEUP_PENDING, &hcd->flags); | ||
1984 | if (status == 0) { | 1984 | if (status == 0) { |
1985 | /* TRSMRCY = 10 msec */ | 1985 | /* TRSMRCY = 10 msec */ |
1986 | msleep(10); | 1986 | msleep(10); |