Merge branch 'master' of ssh://master.kernel.org/home/ftp/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / usb / host / pci-quirks.c

diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 15e4f1d92c7924a541b5150a008b513f9d955af2..033c2846ce5923e05f0805bff889ab45268ea056 100644 (file)
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -234,7 +234,7 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
         */
        hcc_params = readl(base + EHCI_HCC_PARAMS);
        offset = (hcc_params >> 8) & 0xff;
-       while (offset && count--) {
+       while (offset && --count) {
                u32             cap;
                int             msec;
 
@@ -271,7 +271,7 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
                        /* if boot firmware now owns EHCI, spin till
                         * it hands it over.
                         */
-                       msec = 5000;
+                       msec = 1000;
                        while ((cap & EHCI_USBLEGSUP_BIOS) && (msec > 0)) {
                                tried_handoff = 1;
                                msleep(10);