aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/pci-quirks.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 27a3dec32fa2..c7fd6ce11904 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -627,7 +627,7 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
627 void __iomem *base, *op_reg_base; 627 void __iomem *base, *op_reg_base;
628 u32 hcc_params, cap, val; 628 u32 hcc_params, cap, val;
629 u8 offset, cap_length; 629 u8 offset, cap_length;
630 int wait_time, delta, count = 256/4; 630 int wait_time, count = 256/4;
631 631
632 if (!mmio_resource_enabled(pdev, 0)) 632 if (!mmio_resource_enabled(pdev, 0))
633 return; 633 return;
@@ -673,11 +673,10 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
673 writel(val, op_reg_base + EHCI_USBCMD); 673 writel(val, op_reg_base + EHCI_USBCMD);
674 674
675 wait_time = 2000; 675 wait_time = 2000;
676 delta = 100;
677 do { 676 do {
678 writel(0x3f, op_reg_base + EHCI_USBSTS); 677 writel(0x3f, op_reg_base + EHCI_USBSTS);
679 udelay(delta); 678 udelay(100);
680 wait_time -= delta; 679 wait_time -= 100;
681 val = readl(op_reg_base + EHCI_USBSTS); 680 val = readl(op_reg_base + EHCI_USBSTS);
682 if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED)) { 681 if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED)) {
683 break; 682 break;