]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mt76: mt7921s: fix a possible memory leak in mt7921_load_patch
authorLorenzo Bianconi <lorenzo@kernel.org>
Mon, 24 Jan 2022 20:03:44 +0000 (21:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 11:58:02 +0000 (13:58 +0200)
[ Upstream commit 11005b18f453aa192d035d410c11d07edcba5a45 ]

Always release fw data at the end of mt7921_load_patch routine.

Fixes: 78b217580c509 ("mt76: mt7921s: fix bus hang with wrong privilege")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

index 152e7579f77d45334261344a8cc1bb5109d44f87..e82545a7fcc11d1af7fc3089bf176f8537a7e3bd 100644 (file)
@@ -707,12 +707,8 @@ static int mt7921_load_patch(struct mt7921_dev *dev)
        if (mt76_is_sdio(&dev->mt76)) {
                /* activate again */
                ret = __mt7921_mcu_fw_pmctrl(dev);
-               if (ret)
-                       return ret;
-
-               ret = __mt7921_mcu_drv_pmctrl(dev);
-               if (ret)
-                       return ret;
+               if (!ret)
+                       ret = __mt7921_mcu_drv_pmctrl(dev);
        }
 
 out: