瀏覽代碼

Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"

This reverts commit 1996e6c572969a8cf6d7fa97eef621219acd94a9.

It turned out to not be needed, now that the real fix has been
committed.

Reported-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Greg Kroah-Hartman 13 年之前
父節點
當前提交
8e192910d9
共有 3 個文件被更改,包括 1 次插入9 次删除
  1. 1 1
      drivers/usb/host/ehci-hcd.c
  2. 0 7
      drivers/usb/host/ehci-pci.c
  3. 0 1
      drivers/usb/host/ehci.h

+ 1 - 1
drivers/usb/host/ehci-hcd.c

@@ -638,7 +638,7 @@ static int ehci_init(struct usb_hcd *hcd)
 	INIT_LIST_HEAD(&ehci->cached_itd_list);
 	INIT_LIST_HEAD(&ehci->cached_sitd_list);
 
-	if (HCC_PGM_FRAMELISTLEN(hcc_params) && !ehci->sched_size_bug) {
+	if (HCC_PGM_FRAMELISTLEN(hcc_params)) {
 		/* periodic schedule size can be smaller than default */
 		switch (EHCI_TUNE_FLS) {
 		case 0: ehci->periodic_size = 1024; break;

+ 0 - 7
drivers/usb/host/ehci-pci.c

@@ -97,13 +97,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 			break;
 		}
 		break;
-
-	case PCI_VENDOR_ID_PHILIPS:
-		/*
-		 * Philips controllers set HCC_PGM_FRAMELISTLEN, but
-		 * they don't implement schedule sizes shorter than 1024.
-		 */
-		ehci->sched_size_bug = 1;
 	}
 
 	/* cache this readonly data; minimize chip reads */

+ 0 - 1
drivers/usb/host/ehci.h

@@ -149,7 +149,6 @@ struct ehci_hcd {			/* one per controller */
 	unsigned		use_dummy_qh:1;	/* AMD Frame List table quirk*/
 	unsigned		has_synopsys_hc_bug:1; /* Synopsys HC */
 	unsigned		frame_index_bug:1; /* MosChip (AKA NetMos) */
-	unsigned		sched_size_bug:1; /* Philips */
 
 	/* required for usb32 quirk */
 	#define OHCI_CTRL_HCFS          (3 << 6)