From: Lucas Stach <dev@lynxeye.de>
Date: Sat, 22 Oct 2016 23:02:03 +0000 (+0200)
Subject: USB: EHCI: merge all cases that disable the IO watchdog
X-Git-Tag: v4.14-rc1~1921^2~109
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=629dd219881a6d9643806acf4f0166501f4c3374;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 0ed683c..9332697 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;