diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 01:45:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 01:45:46 -0500 |
| commit | 6be325719b3e54624397e413efd4b33a997e55a3 (patch) | |
| tree | 57f321a56794cab2222e179b16731e0d76a4a68a /drivers/usb/host/uhci-hub.c | |
| parent | 26d92f9276a56d55511a427fb70bd70886af647a (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/usb/host/uhci-hub.c')
| -rw-r--r-- | drivers/usb/host/uhci-hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c index 885b585360b9..8270055848ca 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c | |||
| @@ -167,7 +167,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci) | |||
| 167 | /* Port received a wakeup request */ | 167 | /* Port received a wakeup request */ |
| 168 | set_bit(port, &uhci->resuming_ports); | 168 | set_bit(port, &uhci->resuming_ports); |
| 169 | uhci->ports_timeout = jiffies + | 169 | uhci->ports_timeout = jiffies + |
| 170 | msecs_to_jiffies(20); | 170 | msecs_to_jiffies(25); |
| 171 | 171 | ||
| 172 | /* Make sure we see the port again | 172 | /* Make sure we see the port again |
| 173 | * after the resuming period is over. */ | 173 | * after the resuming period is over. */ |