1 files changed, 14 insertions, 17 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index b73a7e0aeed..4eb550fab2f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -351,28 +351,25 @@ EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio);
 /*
  * Device initialization handlers.
  */
-void rt2x00usb_init_rxentry(struct rt2x00_dev *rt2x00dev,
-                            struct queue_entry *entry)
+void rt2x00usb_clear_entry(struct queue_entry *entry)
 {
-        struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
+        struct usb_device *usb_dev =
+            to_usb_device_intf(entry->queue->rt2x00dev->dev);
         struct queue_entry_priv_usb *entry_priv = entry->priv_data;
 
-        usb_fill_bulk_urb(entry_priv->urb, usb_dev,
-                          usb_rcvbulkpipe(usb_dev, 1),
-                          entry->skb->data, entry->skb->len,
-                          rt2x00usb_interrupt_rxdone, entry);
+        if (entry->queue->qid == QID_RX) {
+                usb_fill_bulk_urb(entry_priv->urb, usb_dev,
+                                usb_rcvbulkpipe(usb_dev, 1),
+                                entry->skb->data, entry->skb->len,
+                                rt2x00usb_interrupt_rxdone, entry);
 
-        set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
-        usb_submit_urb(entry_priv->urb, GFP_ATOMIC);
-}
-EXPORT_SYMBOL_GPL(rt2x00usb_init_rxentry);
-
-void rt2x00usb_init_txentry(struct rt2x00_dev *rt2x00dev,
-                            struct queue_entry *entry)
-{
-        entry->flags = 0;
+                set_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
+                usb_submit_urb(entry_priv->urb, GFP_ATOMIC);
+        } else {
+                entry->flags = 0;
+        }
 }
-EXPORT_SYMBOL_GPL(rt2x00usb_init_txentry);
+EXPORT_SYMBOL_GPL(rt2x00usb_clear_entry);
 
 static int rt2x00usb_alloc_urb(struct rt2x00_dev *rt2x00dev,
                                struct data_queue *queue)