Skip to content

Commit

Permalink
Revert "USB: EHCI: work around bug in the Philips ISP1562 controller"
Browse files Browse the repository at this point in the history
This reverts commit 1996e6c.

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>
  • Loading branch information
Greg Kroah-Hartman committed May 21, 2012
1 parent d3ad558 commit 8e19291
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions drivers/usb/host/ehci-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
1 change: 0 additions & 1 deletion drivers/usb/host/ehci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8e19291

Please sign in to comment.