Commit bc2e4a90 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB patch revert from Greg Kroah-Hartman:
 "Here is one remaining USB patch for 3.9-rc1, it reverts a 3.8 patch
  that has caused a lot of regressions for some VIA EHCI controllers."

* tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: EHCI: revert "remove ASS/PSS polling timeout"
parents 68b86a25 221f8dfc
...@@ -113,15 +113,14 @@ static void ehci_poll_ASS(struct ehci_hcd *ehci) ...@@ -113,15 +113,14 @@ static void ehci_poll_ASS(struct ehci_hcd *ehci)
if (want != actual) { if (want != actual) {
/* Poll again later */ /* Poll again later, but give up after about 20 ms */
if (ehci->ASS_poll_count++ < 20) {
ehci_enable_event(ehci, EHCI_HRTIMER_POLL_ASS, true); ehci_enable_event(ehci, EHCI_HRTIMER_POLL_ASS, true);
++ehci->ASS_poll_count;
return; return;
} }
ehci_dbg(ehci, "Waited too long for the async schedule status (%x/%x), giving up\n",
if (ehci->ASS_poll_count > 20) want, actual);
ehci_dbg(ehci, "ASS poll count reached %d\n", }
ehci->ASS_poll_count);
ehci->ASS_poll_count = 0; ehci->ASS_poll_count = 0;
/* The status is up-to-date; restart or stop the schedule as needed */ /* The status is up-to-date; restart or stop the schedule as needed */
...@@ -160,14 +159,14 @@ static void ehci_poll_PSS(struct ehci_hcd *ehci) ...@@ -160,14 +159,14 @@ static void ehci_poll_PSS(struct ehci_hcd *ehci)
if (want != actual) { if (want != actual) {
/* Poll again later */ /* Poll again later, but give up after about 20 ms */
if (ehci->PSS_poll_count++ < 20) {
ehci_enable_event(ehci, EHCI_HRTIMER_POLL_PSS, true); ehci_enable_event(ehci, EHCI_HRTIMER_POLL_PSS, true);
return; return;
} }
ehci_dbg(ehci, "Waited too long for the periodic schedule status (%x/%x), giving up\n",
if (ehci->PSS_poll_count > 20) want, actual);
ehci_dbg(ehci, "PSS poll count reached %d\n", }
ehci->PSS_poll_count);
ehci->PSS_poll_count = 0; ehci->PSS_poll_count = 0;
/* The status is up-to-date; restart or stop the schedule as needed */ /* The status is up-to-date; restart or stop the schedule as needed */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment