aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2016-10-22 19:02:03 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-24 08:36:25 -0400
commit629dd219881a6d9643806acf4f0166501f4c3374 (patch)
tree7b14d04ced4d9aaeed813226f2e74c5d11a4733c
parent5c2ad982fb422ae710184e5911de0d4e030de8ac (diff)
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>
-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)
258 /* These workarounds need to be applied after ehci_setup() */ 258 /* These workarounds need to be applied after ehci_setup() */
259 switch (pdev->vendor) { 259 switch (pdev->vendor) {
260 case PCI_VENDOR_ID_NEC: 260 case PCI_VENDOR_ID_NEC:
261 ehci->need_io_watchdog = 0;
262 break;
263 case PCI_VENDOR_ID_INTEL: 261 case PCI_VENDOR_ID_INTEL:
264 case PCI_VENDOR_ID_AMD: 262 case PCI_VENDOR_ID_AMD:
265 ehci->need_io_watchdog = 0; 263 ehci->need_io_watchdog = 0;