Commit cf6c308a authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

[PATCH] USB: Handle over current inputs on all Intel controllers

This patch for the UHCI driver changes the test for over current inputs,
which can cause false Resume indications with some of Intel's USB
controllers.  Previously the code only checked for one specific controller
chip, but now another one has turned up that exhibits the same flaw.  It
seems best just to check for Intel being the manufacturer, especially
since it doesn't hurt to check for the condition when it isn't present or
is only temporary.
parent 41abfeb2
...@@ -2007,19 +2007,17 @@ static int suspend_allowed(struct uhci_hcd *uhci) ...@@ -2007,19 +2007,17 @@ static int suspend_allowed(struct uhci_hcd *uhci)
unsigned int io_addr = uhci->io_addr; unsigned int io_addr = uhci->io_addr;
int i; int i;
if (!uhci->hcd.pdev || if (!uhci->hcd.pdev || uhci->hcd.pdev->vendor != PCI_VENDOR_ID_INTEL)
uhci->hcd.pdev->vendor != PCI_VENDOR_ID_INTEL ||
uhci->hcd.pdev->device != PCI_DEVICE_ID_INTEL_82371AB_2)
return 1; return 1;
/* This is a 82371AB/EB/MB USB controller which has a bug that /* Some of Intel's USB controllers have a bug that causes false
* causes false resume indications if any port has an * resume indications if any port has an over current condition.
* over current condition. To prevent problems, we will not * To prevent problems, we will not allow a global suspend if
* allow a global suspend if any ports are OC. * any ports are OC.
* *
* Some motherboards using the 82371AB/EB/MB (but not the USB portion) * Some motherboards using Intel's chipsets (but not using all
* appear to hardwire the over current inputs active to disable * the USB ports) appear to hardwire the over current inputs active
* the USB ports. * to disable the USB ports.
*/ */
/* check for over current condition on any port */ /* check for over current condition on any port */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment