]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mt76: mt7915: fix memleak when mt7915_unregister_device()
authorRyder Lee <ryder.lee@mediatek.com>
Tue, 13 Apr 2021 05:34:57 +0000 (13:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:50:14 +0000 (10:50 +0200)
[ 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

index 2ec18aaa828075a4c89c15d53eddded52974b4df..148a92efdd4ee76c741ad2eb26983bf1c60f55c7 100644 (file)
@@ -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);
 }