2 files changed, 5 insertions, 11 deletions

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 4b66374bdc8e..3d989028c836 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -264,15 +264,9 @@ ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
 __releases(ehci->lock)
 __acquires(ehci->lock)
 {
-        if (likely (urb->hcpriv != NULL)) {
-                struct ehci_qh  *qh = (struct ehci_qh *) urb->hcpriv;
-
-                /* S-mask in a QH means it's an interrupt urb */
-                if ((qh->hw->hw_info2 & cpu_to_hc32(ehci, QH_SMASK)) != 0) {
-
-                        /* ... update hc-wide periodic stats (for usbfs) */
-                        ehci_to_hcd(ehci)->self.bandwidth_int_reqs--;
-                }
+        if (usb_pipetype(urb->pipe) == PIPE_INTERRUPT) {
+                /* ... update hc-wide periodic stats */
+                ehci_to_hcd(ehci)->self.bandwidth_int_reqs--;
         }
 
         if (unlikely(urb->unlinked)) {
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index 2e14714b359f..69ebee73c0c1 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -1630,7 +1630,7 @@ static void itd_link_urb(
 
         /* don't need that schedule data any more */
         iso_sched_free (stream, iso_sched);
-        urb->hcpriv = NULL;
+        urb->hcpriv = stream;
 
         ++ehci->isoc_count;
         enable_periodic(ehci);
@@ -2029,7 +2029,7 @@ static void sitd_link_urb(
 
         /* don't need that schedule data any more */
         iso_sched_free (stream, sched);
-        urb->hcpriv = NULL;
+        urb->hcpriv = stream;
 
         ++ehci->isoc_count;
         enable_periodic(ehci);