diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:10:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-23 05:10:30 -0400 |
| commit | 70bce3ba77540ebe77b8c0e1ac38d281a23fbb5e (patch) | |
| tree | 34b09a49228f0949ff49dce66a433b0dfd83a2dc /drivers/usb/host/ehci-hub.c | |
| parent | 6eca8cc35b50af1037bc919106dd6dd332c959c2 (diff) | |
| parent | d5a30458a90597915977f06e79406b664a41b8ac (diff) | |
Merge branch 'linus' into perf/core
Merge reason: merge the latest fixes, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/host/ehci-hub.c')
| -rw-r--r-- | drivers/usb/host/ehci-hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c index 19372673bf09..c7178bcde67a 100644 --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c | |||
| @@ -801,7 +801,7 @@ static int ehci_hub_control ( | |||
| 801 | * this bit; seems too long to spin routinely... | 801 | * this bit; seems too long to spin routinely... |
| 802 | */ | 802 | */ |
| 803 | retval = handshake(ehci, status_reg, | 803 | retval = handshake(ehci, status_reg, |
| 804 | PORT_RESET, 0, 750); | 804 | PORT_RESET, 0, 1000); |
| 805 | if (retval != 0) { | 805 | if (retval != 0) { |
| 806 | ehci_err (ehci, "port %d reset error %d\n", | 806 | ehci_err (ehci, "port %d reset error %d\n", |
| 807 | wIndex + 1, retval); | 807 | wIndex + 1, retval); |