| From f0f595548368211a27e20fd897f2bfd5b30582f6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 13 Apr 2021 13:34:57 +0800 |
| Subject: mt76: mt7915: fix memleak when mt7915_unregister_device() |
| |
| From: Ryder Lee <ryder.lee@mediatek.com> |
| |
| [ Upstream commit e9d32af478cfc3744a45245c0b126738af4b3ac4 ] |
| |
| mt7915_tx_token_put() should get call before mt76_free_pending_txwi(). |
| |
| Fixes: f285dfb98562 ("mt76: mt7915: 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/mt7915/init.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/init.c b/drivers/net/wireless/mediatek/mt76/mt7915/init.c |
| index 2ec18aaa8280..148a92efdd4e 100644 |
| --- a/drivers/net/wireless/mediatek/mt76/mt7915/init.c |
| +++ b/drivers/net/wireless/mediatek/mt76/mt7915/init.c |
| @@ -675,9 +675,8 @@ void mt7915_unregister_device(struct mt7915_dev *dev) |
| mt7915_unregister_ext_phy(dev); |
| mt76_unregister_device(&dev->mt76); |
| mt7915_mcu_exit(dev); |
| - mt7915_dma_cleanup(dev); |
| - |
| mt7915_tx_token_put(dev); |
| + mt7915_dma_cleanup(dev); |
| |
| mt76_free_device(&dev->mt76); |
| } |
| -- |
| 2.30.2 |
| |
