diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 19:20:34 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-22 19:20:34 -0500 |
| commit | d02e30c31c57683a66ed68a1bcff900ca78f6d56 (patch) | |
| tree | c3ce99a00061bcc1199b50fa838147d876c56717 /drivers/usb/host/uhci-hub.c | |
| parent | 0fdc7a8022c3eaff6b5ee27ffb9e913e5e58d8e9 (diff) | |
| parent | aef55d4922e62a0d887e60d87319f3718aec6ced (diff) | |
Merge branch 'x86/irq' into x86/apic
Merge reason:
Conflicts in arch/x86/kernel/apic/io_apic.c
Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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. */ |