From: David Miller <davem@davemloft.net>
Date: Wed, 7 Apr 2010 01:26:03 +0000 (-0700)
Subject: USB: ehci: Elide I/O watchdog on NEC parts
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

USB: ehci: Elide I/O watchdog on NEC parts

I've been running with this patch on my Niagara2 boxes for some time
and have not seen any ill effects yet.  Maybe we can stash this into
the USB tree to get exposure for some time in -next and if anything
crops up we can simply revert?

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index ead5f4f2aa5a..d120059bbbf7 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -109,6 +109,9 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 		return retval;
 
 	switch (pdev->vendor) {
+	case PCI_VENDOR_ID_NEC:
+		ehci->need_io_watchdog = 0;
+		break;
 	case PCI_VENDOR_ID_INTEL:
 		ehci->need_io_watchdog = 0;
 		if (pdev->device == 0x27cc) {