summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-pci.c
diff options
context:
space:
mode:
authorBrian J. Tarricone <brian@tarricone.org>2010-11-22 06:15:52 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-30 19:27:36 +0100
commita85b4e7f4481c5a1ca89fa63c9c871151965075e (patch)
treed1fe4dfa047f584ea13a526ced58d05802da68f5 /drivers/usb/host/ehci-pci.c
parentUSB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added (diff)
downloadlinux-a85b4e7f4481c5a1ca89fa63c9c871151965075e.tar.xz
linux-a85b4e7f4481c5a1ca89fa63c9c871151965075e.zip
USB: ehci: disable LPM and PPCD for nVidia MCP89 chips
Tested on MacBookAir3,1. Without this, we get EPROTO errors when fetching device config descriptors. Signed-off-by: Brian Tarricone <brian@tarricone.org> Reported-by: Benoit Gschwind <gschwind@gnu-log.net> Tested-by: Edgar Hucek <gimli@dark-green.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
-rw-r--r--drivers/usb/host/ehci-pci.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 01bb72b71832..655f3c9f88bf 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -161,6 +161,18 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
if (pdev->revision < 0xa4)
ehci->no_selective_suspend = 1;
break;
+
+ /* MCP89 chips on the MacBookAir3,1 give EPROTO when
+ * fetching device descriptors unless LPM is disabled.
+ * There are also intermittent problems enumerating
+ * devices with PPCD enabled.
+ */
+ case 0x0d9d:
+ ehci_info(ehci, "disable lpm/ppcd for nvidia mcp89");
+ ehci->has_lpm = 0;
+ ehci->has_ppcd = 0;
+ ehci->command &= ~CMD_PPCEE;
+ break;
}
break;
case PCI_VENDOR_ID_VIA: