diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-23 06:23:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-23 06:23:28 -0700 |
| commit | c8caa38a824215b4850e26af6ef808aea35b67fd (patch) | |
| tree | 2bed23ee0e7e1063b1c675c941559b0aef0b4d20 /usb | |
| parent | 2294c7ccc0b7e70f8be4124072aecc8502c357ed (diff) | |
| download | patches-c8caa38a824215b4850e26af6ef808aea35b67fd.tar.gz | |
2.6.31-git12 resync
Diffstat (limited to 'usb')
3 files changed, 4 insertions, 4 deletions
diff --git a/usb/usb-dbgp-ehci-debug-controller-initialization-delays.patch b/usb/usb-dbgp-ehci-debug-controller-initialization-delays.patch index 96293b57ed3aa7..03eca181cc69a9 100644 --- a/usb/usb-dbgp-ehci-debug-controller-initialization-delays.patch +++ b/usb/usb-dbgp-ehci-debug-controller-initialization-delays.patch @@ -121,7 +121,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -1; } -- loop = 10; +- loop = 100000; + loop = 250 * 1000; /* Reset the EHCI controller */ cmd = readl(&ehci_regs->command); diff --git a/usb/usb-ehci-dbgp-early_printk-split-ehci-debug-driver-from-early_printk.c.patch b/usb/usb-ehci-dbgp-early_printk-split-ehci-debug-driver-from-early_printk.c.patch index 192e2296669e87..14025c6c8b0b94 100644 --- a/usb/usb-ehci-dbgp-early_printk-split-ehci-debug-driver-from-early_printk.c.patch +++ b/usb/usb-ehci-dbgp-early_printk-split-ehci-debug-driver-from-early_printk.c.patch @@ -500,7 +500,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - return -1; - } - -- loop = 10; +- loop = 100000; - /* Reset the EHCI controller */ - cmd = readl(&ehci_regs->command); - cmd |= CMD_RESET; @@ -1230,7 +1230,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + return -1; + } + -+ loop = 10; ++ loop = 100000; + /* Reset the EHCI controller */ + cmd = readl(&ehci_regs->command); + cmd |= CMD_RESET; diff --git a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch index 69e2cbba6b6750..ba902cc8b45cbc 100644 --- a/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch +++ b/usb/usb-gadget-update-freescale-udc-entry-in-maintainers.patch @@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2106,12 +2106,12 @@ S: Supported +@@ -2107,12 +2107,12 @@ S: Supported F: arch/powerpc/sysdev/qe_lib/ F: arch/powerpc/include/asm/*qe.h |