Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e192910 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit 1996e6c5.

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

Reported-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3ad558f

drivers/usb/host/ehci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/usb/host/ehci-pci.c

+0 −7
Original line number Diff line number Diff line
@@ -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 */

drivers/usb/host/ehci.h

+0 −1
Original line number Diff line number Diff line
@@ -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)