summaryrefslogtreecommitdiff
path: root/drivers/usb/host/ehci-pci.c
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2016-10-23 02:02:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-24 15:36:25 +0300
commit629dd219881a6d9643806acf4f0166501f4c3374 (patch)
tree7b14d04ced4d9aaeed813226f2e74c5d11a4733c /drivers/usb/host/ehci-pci.c
parent5c2ad982fb422ae710184e5911de0d4e030de8ac (diff)
downloadlinux-629dd219881a6d9643806acf4f0166501f4c3374.tar.xz
USB: EHCI: merge all cases that disable the IO watchdog
This merges the vendor NEC case with the INTEL and AMD one, as those 3 do exactly the same thing: disabling of the IO watchdog. Signed-off-by: Lucas Stach <dev@lynxeye.de> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
-rw-r--r--drivers/usb/host/ehci-pci.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 0ed683c176f0..93326974ff4b 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -258,8 +258,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
/* These workarounds need to be applied after ehci_setup() */
switch (pdev->vendor) {
case PCI_VENDOR_ID_NEC:
- ehci->need_io_watchdog = 0;
- break;
case PCI_VENDOR_ID_INTEL:
case PCI_VENDOR_ID_AMD:
ehci->need_io_watchdog = 0;