diff options
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
-rw-r--r-- | drivers/usb/host/ehci-hub.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 5d84562e2716..05490d387fd2 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
@@ -208,7 +208,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) | |||
208 | 208 | ||
209 | if (time_before (jiffies, ehci->next_statechange)) | 209 | if (time_before (jiffies, ehci->next_statechange)) |
210 | msleep(5); | 210 | msleep(5); |
211 | del_timer_sync(&ehci->watchdog); | ||
212 | 211 | ||
213 | spin_lock_irq (&ehci->lock); | 212 | spin_lock_irq (&ehci->lock); |
214 | 213 | ||
@@ -316,10 +315,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) | |||
316 | ehci->next_hrtimer_event = EHCI_HRTIMER_NO_EVENT; | 315 | ehci->next_hrtimer_event = EHCI_HRTIMER_NO_EVENT; |
317 | spin_unlock_irq (&ehci->lock); | 316 | spin_unlock_irq (&ehci->lock); |
318 | 317 | ||
319 | /* ehci_work() may have re-enabled the watchdog timer, which we do not | ||
320 | * want, and so we must delete any pending watchdog timer events. | ||
321 | */ | ||
322 | del_timer_sync(&ehci->watchdog); | ||
323 | hrtimer_cancel(&ehci->hrtimer); | 318 | hrtimer_cancel(&ehci->hrtimer); |
324 | return 0; | 319 | return 0; |
325 | } | 320 | } |