diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
| commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
| tree | 4baf91483886d561c198ed0524ab54b783273e86 /drivers/usb/host/ehci-hub.c | |
| parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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); |