1 files changed, 11 insertions, 5 deletions

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