7 files changed, 69 insertions, 13 deletions

diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index ada5d2ba297b..556d0ec0c1f8 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -323,7 +323,7 @@ static int tt_available (
                  * already scheduled transactions
                  */
                 if (125 < usecs) {
-                        int ufs = (usecs / 125) - 1;
+                        int ufs = (usecs / 125);
                         int i;
                         for (i = uframe; i < (uframe + ufs) && i < 8; i++)
                                 if (0 < tt_usecs[i]) {
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c
index 958751ccea43..c2050785a819 100644
--- a/drivers/usb/host/whci/asl.c
+++ b/drivers/usb/host/whci/asl.c
@@ -122,7 +122,8 @@ static uint32_t process_qset(struct whc *whc, struct whc_qset *qset)
                 process_inactive_qtd(whc, qset, td);
         }
 
-        update |= qset_add_qtds(whc, qset);
+        if (!qset->remove)
+                update |= qset_add_qtds(whc, qset);
 
 done:
         /*
@@ -254,23 +255,29 @@ int asl_urb_enqueue(struct whc *whc, struct urb *urb, gfp_t mem_flags)
 
         spin_lock_irqsave(&whc->lock, flags);
 
+        err = usb_hcd_link_urb_to_ep(&whc->wusbhc.usb_hcd, urb);
+        if (err < 0) {
+                spin_unlock_irqrestore(&whc->lock, flags);
+                return err;
+        }
+
         qset = get_qset(whc, urb, GFP_ATOMIC);
         if (qset == NULL)
                 err = -ENOMEM;
         else
                 err = qset_add_urb(whc, qset, urb, GFP_ATOMIC);
         if (!err) {
-                usb_hcd_link_urb_to_ep(&whc->wusbhc.usb_hcd, urb);
                 if (!qset->in_sw_list)
                         asl_qset_insert_begin(whc, qset);
-        }
+        } else
+                usb_hcd_unlink_urb_from_ep(&whc->wusbhc.usb_hcd, urb);
 
         spin_unlock_irqrestore(&whc->lock, flags);
 
         if (!err)
                 queue_work(whc->workqueue, &whc->async_work);
 
-        return 0;
+        return err;
 }
 
 /**
diff --git a/drivers/usb/host/whci/hcd.c b/drivers/usb/host/whci/hcd.c
index 1569afd6245b..e019a5058ab8 100644
--- a/drivers/usb/host/whci/hcd.c
+++ b/drivers/usb/host/whci/hcd.c
@@ -186,6 +186,28 @@ static void whc_endpoint_disable(struct usb_hcd *usb_hcd,
         }
 }
 
+static void whc_endpoint_reset(struct usb_hcd *usb_hcd,
+                               struct usb_host_endpoint *ep)
+{
+        struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);
+        struct whc *whc = wusbhc_to_whc(wusbhc);
+        struct whc_qset *qset;
+
+        qset = ep->hcpriv;
+        if (qset) {
+                qset->remove = 1;
+
+                if (usb_endpoint_xfer_bulk(&ep->desc)
+                    || usb_endpoint_xfer_control(&ep->desc))
+                        queue_work(whc->workqueue, &whc->async_work);
+                else
+                        queue_work(whc->workqueue, &whc->periodic_work);
+
+                qset_reset(whc, qset);
+        }
+}
+
+
 static struct hc_driver whc_hc_driver = {
         .description = "whci-hcd",
         .product_desc = "Wireless host controller",
@@ -200,6 +222,7 @@ static struct hc_driver whc_hc_driver = {
         .urb_enqueue = whc_urb_enqueue,
         .urb_dequeue = whc_urb_dequeue,
         .endpoint_disable = whc_endpoint_disable,
+        .endpoint_reset = whc_endpoint_reset,
 
         .hub_status_data = wusbhc_rh_status_data,
         .hub_control = wusbhc_rh_control,
diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c
index df8b85f07092..ff4ef9e910d9 100644
--- a/drivers/usb/host/whci/pzl.c
+++ b/drivers/usb/host/whci/pzl.c
@@ -128,7 +128,8 @@ static enum whc_update pzl_process_qset(struct whc *whc, struct whc_qset *qset)
                 process_inactive_qtd(whc, qset, td);
         }
 
-        update |= qset_add_qtds(whc, qset);
+        if (!qset->remove)
+                update |= qset_add_qtds(whc, qset);
 
 done:
         /*
@@ -282,23 +283,29 @@ int pzl_urb_enqueue(struct whc *whc, struct urb *urb, gfp_t mem_flags)
 
         spin_lock_irqsave(&whc->lock, flags);
 
+        err = usb_hcd_link_urb_to_ep(&whc->wusbhc.usb_hcd, urb);
+        if (err < 0) {
+                spin_unlock_irqrestore(&whc->lock, flags);
+                return err;
+        }
+
         qset = get_qset(whc, urb, GFP_ATOMIC);
         if (qset == NULL)
                 err = -ENOMEM;
         else
                 err = qset_add_urb(whc, qset, urb, GFP_ATOMIC);
         if (!err) {
-                usb_hcd_link_urb_to_ep(&whc->wusbhc.usb_hcd, urb);
                 if (!qset->in_sw_list)
                         qset_insert_in_sw_list(whc, qset);
-        }
+        } else
+                usb_hcd_unlink_urb_from_ep(&whc->wusbhc.usb_hcd, urb);
 
         spin_unlock_irqrestore(&whc->lock, flags);
 
         if (!err)
                 queue_work(whc->workqueue, &whc->periodic_work);
 
-        return 0;
+        return err;
 }
 
 /**
@@ -353,7 +360,6 @@ void pzl_qset_delete(struct whc *whc, struct whc_qset *qset)
         qset_delete(whc, qset);
 }
 
-
 /**
  * pzl_init - initialize the periodic zone list
  * @whc: the WHCI host controller
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c
index 7be74314ee12..640b38fbd051 100644
--- a/drivers/usb/host/whci/qset.c
+++ b/drivers/usb/host/whci/qset.c
@@ -89,11 +89,16 @@ static void qset_fill_qh(struct whc_qset *qset, struct urb *urb)
                 QH_INFO3_TX_RATE_53_3
                 | QH_INFO3_TX_PWR(0) /* 0 == max power */
                 );
+
+        qset->qh.cur_window = cpu_to_le32((1 << qset->max_burst) - 1);
 }
 
 /**
  * qset_clear - clear fields in a qset so it may be reinserted into a
- * schedule
+ * schedule.
+ *
+ * The sequence number and current window are not cleared (see
+ * qset_reset()).
  */
 void qset_clear(struct whc *whc, struct whc_qset *qset)
 {
@@ -101,9 +106,8 @@ void qset_clear(struct whc *whc, struct whc_qset *qset)
         qset->remove = 0;
 
         qset->qh.link = cpu_to_le32(QH_LINK_NTDS(8) | QH_LINK_T);
-        qset->qh.status = cpu_to_le16(QH_STATUS_ICUR(qset->td_start));
+        qset->qh.status = qset->qh.status & QH_STATUS_SEQ_MASK;
         qset->qh.err_count = 0;
-        qset->qh.cur_window = cpu_to_le32((1 << qset->max_burst) - 1);
         qset->qh.scratch[0] = 0;
         qset->qh.scratch[1] = 0;
         qset->qh.scratch[2] = 0;
@@ -114,6 +118,20 @@ void qset_clear(struct whc *whc, struct whc_qset *qset)
 }
 
 /**
+ * qset_reset - reset endpoint state in a qset.
+ *
+ * Clears the sequence number and current window.  This qset must not
+ * be in the ASL or PZL.
+ */
+void qset_reset(struct whc *whc, struct whc_qset *qset)
+{
+        wait_for_completion(&qset->remove_complete);
+
+        qset->qh.status &= ~QH_STATUS_SEQ_MASK;
+        qset->qh.cur_window = cpu_to_le32((1 << qset->max_burst) - 1);
+}
+
+/**
  * get_qset - get the qset for an async endpoint
  *
  * A new qset is created if one does not already exist.
diff --git a/drivers/usb/host/whci/whcd.h b/drivers/usb/host/whci/whcd.h
index d3543a181dc9..24e94d983c5e 100644
--- a/drivers/usb/host/whci/whcd.h
+++ b/drivers/usb/host/whci/whcd.h
@@ -184,6 +184,7 @@ void qset_free(struct whc *whc, struct whc_qset *qset);
 struct whc_qset *get_qset(struct whc *whc, struct urb *urb, gfp_t mem_flags);
 void qset_delete(struct whc *whc, struct whc_qset *qset);
 void qset_clear(struct whc *whc, struct whc_qset *qset);
+void qset_reset(struct whc *whc, struct whc_qset *qset);
 int qset_add_urb(struct whc *whc, struct whc_qset *qset, struct urb *urb,
                  gfp_t mem_flags);
 void qset_free_std(struct whc *whc, struct whc_std *std);
diff --git a/drivers/usb/host/whci/whci-hc.h b/drivers/usb/host/whci/whci-hc.h
index 51df7e313b38..794dba0d0f0a 100644
--- a/drivers/usb/host/whci/whci-hc.h
+++ b/drivers/usb/host/whci/whci-hc.h
@@ -185,6 +185,7 @@ struct whc_qhead {
 #define QH_STATUS_FLOW_CTRL      (1 << 15)
 #define QH_STATUS_ICUR(i)        ((i) << 5)
 #define QH_STATUS_TO_ICUR(s)     (((s) >> 5) & 0x7)
+#define QH_STATUS_SEQ_MASK       0x1f
 
 /**
  * usb_pipe_to_qh_type - USB core pipe type to QH transfer type