mt76: mt7615: fix memleak when mt7615_unregister_device()

BugLink: https://bugs.launchpad.net/bugs/1929455
[ Upstream commit 8ab31da7b89f71c4c2defcca989fab7b42f87d71 ]

mt7615_tx_token_put() should get call before mt76_free_pending_txwi().

Fixes: a6275e934605 ("mt76: mt7615: reset token when mac_reset happens")
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
index 58a0ec1bf8d7b78f2edc954bfa6698629271872d..5dd1c6d501adeb3e11c402246fd5a61d73713872 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
@@ -168,10 +168,9 @@ void mt7615_unregister_device(struct mt7615_dev *dev)
        mt76_unregister_device(&dev->mt76);
        if (mcu_running)
                mt7615_mcu_exit(dev);
-       mt7615_dma_cleanup(dev);
 
        mt7615_tx_token_put(dev);
-
+       mt7615_dma_cleanup(dev);
        tasklet_disable(&dev->irq_tasklet);
 
        mt76_free_device(&dev->mt76);