3 files changed, 17 insertions, 4 deletions

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 83344d688ff0..214851a6244f 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -546,6 +546,17 @@ static int uhci_init(struct usb_hcd *hcd)
         }
         uhci->rh_numports = port;
 
+        /* Intel controllers report the OverCurrent bit active on.
+         * VIA controllers report it active off, so we'll adjust the
+         * bit value.  (It's not standardized in the UHCI spec.)
+         */
+        if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_VIA)
+                uhci->oc_low = 1;
+
+        /* HP's server management chip requires a longer port reset delay. */
+        if (to_pci_dev(uhci_dev(uhci))->vendor == PCI_VENDOR_ID_HP)
+                uhci->wait_for_hp = 1;
+
         /* Kick BIOS off this hardware and reset if the controller
          * isn't already safely quiescent.
          */
diff --git a/drivers/usb/host/uhci-hcd.h b/drivers/usb/host/uhci-hcd.h
index 49bf2790f9c2..f86db61cf085 100644
--- a/drivers/usb/host/uhci-hcd.h
+++ b/drivers/usb/host/uhci-hcd.h
@@ -415,6 +415,10 @@ struct uhci_hcd {
 
         struct timer_list fsbr_timer;           /* For turning off FBSR */
 
+        /* Silicon quirks */
+        unsigned int oc_low:1;                  /* OverCurrent bit active low */
+        unsigned int wait_for_hp:1;             /* Wait for HP port reset */
+
         /* Support for port suspend/resume/reset */
         unsigned long port_c_suspend;           /* Bit-arrays of ports */
         unsigned long resuming_ports;
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index 6d59c0f77f25..75418265488d 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -149,8 +149,7 @@ static void uhci_check_ports(struct uhci_hcd *uhci)
 
                                 /* HP's server management chip requires
                                  * a longer delay. */
-                                if (to_pci_dev(uhci_dev(uhci))->vendor ==
-                                                PCI_VENDOR_ID_HP)
+                                if (uhci->wait_for_hp)
                                         wait_for_HP(port_addr);
 
                                 /* If the port was enabled before, turning
@@ -266,8 +265,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                  * VIA controllers report it active off, so we'll adjust the
                  * bit value.  (It's not standardized in the UHCI spec.)
                  */
-                if (to_pci_dev(hcd->self.controller)->vendor ==
-                                PCI_VENDOR_ID_VIA)
+                if (uhci->oc_low)
                         status ^= USBPORTSC_OC;
 
                 /* UHCI doesn't support C_RESET (always false) */