diff options
| author | David Brownell <david-b@pacbell.net> | 2005-05-09 20:23:51 -0400 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-05-17 00:44:25 -0400 |
| commit | 4756ae5b5234e08150ac089f7d989613948f00e5 (patch) | |
| tree | f98447ecbd5dc59446d87c87f4c6ba3cf0708290 /drivers | |
| parent | 80615f81534109a22a732d0328d63ced4432824e (diff) | |
[PATCH] USB: ehci suspend must stop timer
Force the EHCI watchdog timer off during suspend, in case for some
reason it was still running after the root hub suspended.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 02fefab3501e..429330bc38de 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
| @@ -72,6 +72,7 @@ static int ehci_hub_suspend (struct usb_hcd *hcd) | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | /* turn off now-idle HC */ | 74 | /* turn off now-idle HC */ |
| 75 | del_timer_sync (&ehci->watchdog); | ||
| 75 | ehci_halt (ehci); | 76 | ehci_halt (ehci); |
| 76 | hcd->state = HC_STATE_SUSPENDED; | 77 | hcd->state = HC_STATE_SUSPENDED; |
| 77 | 78 | ||