diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2012-07-11 17:22:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-17 01:56:46 +0200 |
| commit | 9d9387475af261949f61a5ec465e1f762d7be08a (patch) | |
| tree | 7aa6688962bde78fba655b791612e60cc1b50adf /drivers/usb/host/ehci-hub.c | |
| parent | USB: EHCI: don't refcount iso_stream structures (diff) | |
| download | linux-9d9387475af261949f61a5ec465e1f762d7be08a.tar.xz linux-9d9387475af261949f61a5ec465e1f762d7be08a.zip | |
USB: EHCI: use hrtimer for the IAA watchdog
This patch (as1581) replaces the iaa_watchdog kernel timer used by
ehci-hcd with an hrtimer event, in keeping with the general conversion
to high-res timers.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 6ad806bbe468..3097872b1e74 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -209,7 +209,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) if (time_before (jiffies, ehci->next_statechange)) msleep(5); del_timer_sync(&ehci->watchdog); - del_timer_sync(&ehci->iaa_watchdog); spin_lock_irq (&ehci->lock); |