diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-06-16 20:33:53 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:15:05 -0700 |
| commit | 79d660ad40fb5f5e5c9e18ac0b37b600974090ee (patch) | |
| tree | fdc1be8615a80ae53ced1695e0786a722d7cfe50 /drivers/usb/host/ehci-hub.c | |
| parent | 7b3b4f0d2306891c8dcfda80a1a181a3f366b4d1 (diff) | |
Revert "USB: EHCI: fix timer bug affecting port resume"
This reverts commit ee74290b7853db9d5fd64db70e5c175241c59fba.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 87dc16c9f817..836c6eef42f4 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c @@ -673,11 +673,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf) status = STS_PCD; } } - - /* If a resume is in progress, make sure it can finish */ - if (ehci->resuming_ports) - mod_timer(&hcd->rh_timer, jiffies + msecs_to_jiffies(25)); - + /* FIXME autosuspend idle root hubs */ spin_unlock_irqrestore (&ehci->lock, flags); return status ? retval : 0; } |