From c57789fb95d68cf965eef8467e531cf624fecad9 Mon Sep 17 00:00:00 2001 From: David Miller Date: Tue, 6 Apr 2010 18:26:03 -0700 Subject: [PATCH] --- yaml --- r: 195396 b: refs/heads/master c: 3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-pci.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f523a2a3ca7d..7c9d0da18cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ed3fd6c10a161626120862d39f0211657d7c876 +refs/heads/master: 3681d8f3ee8f47b60b4621a3d80f8d1d39e7185b diff --git a/trunk/drivers/usb/host/ehci-pci.c b/trunk/drivers/usb/host/ehci-pci.c index ead5f4f2aa5a..d120059bbbf7 100644 --- a/trunk/drivers/usb/host/ehci-pci.c +++ b/trunk/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) {