revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-sched.c

diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index fa442c5ec16beb44c10210f848e1f81644995699..a92526d6e5aeb4a306442df77d27b702e00c0d0c 100644 (file)
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -2261,7 +2261,6 @@ scan_periodic (struct ehci_hcd *ehci)
        }
        clock &= mod - 1;
        clock_frame = clock >> 3;
-       ++ehci->periodic_stamp;
 
        for (;;) {
                union ehci_shadow       q, *q_p;
@@ -2290,14 +2289,10 @@ restart:
                                temp.qh = qh_get (q.qh);
                                type = Q_NEXT_TYPE(ehci, q.qh->hw->hw_next);
                                q = q.qh->qh_next;
-                               if (temp.qh->stamp != ehci->periodic_stamp) {
-                                       modified = qh_completions(ehci, temp.qh);
-                                       if (!modified)
-                                               temp.qh->stamp = ehci->periodic_stamp;
-                                       if (unlikely(list_empty(&temp.qh->qtd_list) ||
-                                                       temp.qh->needs_rescan))
-                                               intr_deschedule(ehci, temp.qh);
-                               }
+                               modified = qh_completions (ehci, temp.qh);
+                               if (unlikely(list_empty(&temp.qh->qtd_list) ||
+                                               temp.qh->needs_rescan))
+                                       intr_deschedule (ehci, temp.qh);
                                qh_put (temp.qh);
                                break;
                        case Q_TYPE_FSTN:
@@ -2432,7 +2427,6 @@ restart:
                                free_cached_lists(ehci);
                                ehci->clock_frame = clock_frame;
                        }
-                       ++ehci->periodic_stamp;
                } else {
                        now_uframe++;
                        now_uframe &= mod - 1;