summaryrefslogtreecommitdiff
path: root/drivers/usb/host/ehci-pci.c
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2010-04-07 01:26:03 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 20:21:38 (GMT)
commit3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b (patch)
tree752c40fb42ee848381db9503f9d4b50354c889bf /drivers/usb/host/ehci-pci.c
parent9ed3fd6c10a161626120862d39f0211657d7c876 (diff)
downloadlinux-3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b.tar.xz
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/host/ehci-pci.c')
-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 ead5f4f..d120059 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) {