2 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 54e37e08c114..e4d97ad25bf4 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -416,7 +416,10 @@ static void rt2800pci_toggle_irq(struct rt2x00_dev *rt2x00dev,
         if (state == STATE_RADIO_IRQ_ON) {
                 rt2800_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
                 rt2800_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
-        }
+
+                tasklet_enable(&rt2x00dev->txstatus_tasklet);
+        } else if (state == STATE_RADIO_IRQ_OFF)
+                tasklet_disable(&rt2x00dev->txstatus_tasklet);
 
         rt2800_register_read(rt2x00dev, INT_MASK_CSR, &reg);
         rt2x00_set_field32(&reg, INT_MASK_CSR_RXDELAYINT, 0);
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 7d4dece64c1a..5812a4e05c7f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -821,13 +821,6 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
                                      GFP_KERNEL);
                 if (status)
                         return status;
-
-                /* tasklet for processing the tx status reports. */
-                if (rt2x00dev->ops->lib->txstatus_tasklet)
-                        tasklet_init(&rt2x00dev->txstatus_tasklet,
-                                     rt2x00dev->ops->lib->txstatus_tasklet,
-                                     (unsigned long)rt2x00dev);
-
         }
 
         /*
@@ -843,6 +836,7 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
                 tasklet_disable(&rt2x00dev->taskletname); \
         }
 
+        RT2X00_TASKLET_INIT(txstatus_tasklet);
         RT2X00_TASKLET_INIT(pretbtt_tasklet);
         RT2X00_TASKLET_INIT(tbtt_tasklet);
         RT2X00_TASKLET_INIT(rxdone_tasklet);