aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2010-04-06 21:26:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 16:21:38 -0400
commit3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b (patch)
tree752c40fb42ee848381db9503f9d4b50354c889bf /drivers/usb
parent9ed3fd6c10a161626120862d39f0211657d7c876 (diff)
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ehci-pci.c3
1 files changed, 3 insertions, 0 deletions
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)
109 return retval; 109 return retval;
110 110
111 switch (pdev->vendor) { 111 switch (pdev->vendor) {
112 case PCI_VENDOR_ID_NEC:
113 ehci->need_io_watchdog = 0;
114 break;
112 case PCI_VENDOR_ID_INTEL: 115 case PCI_VENDOR_ID_INTEL:
113 ehci->need_io_watchdog = 0; 116 ehci->need_io_watchdog = 0;
114 if (pdev->device == 0x27cc) { 117 if (pdev->device == 0x27cc) {