| From af59d859383deb811f426b9e1c474d4ac954ff28 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 13 Apr 2021 13:34:56 +0800 |
| Subject: mt76: mt7615: fix memleak when mt7615_unregister_device() |
| |
| From: Ryder Lee <ryder.lee@mediatek.com> |
| |
| [ 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> |
| --- |
| drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c |
| index 58a0ec1bf8d7..5dd1c6d501ad 100644 |
| --- 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); |
| -- |
| 2.30.2 |
| |
