mt76: mt7921: move fw toggle in mt7921_load_firmware

Move drv_own/fw_own toggle in mt7921_load_firmware. This change allow to
reuse connac code to load patch for mt7921 driver.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Tested-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index ccf68bdd0e1caa76433c410bfd84a3d5b4cd1258..eea26b51fed859c2dbb9671a9b1cd6957bce4a6b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -537,13 +537,6 @@ out:
                break;
        }
 
-       if (!ret && mt76_is_sdio(&dev->mt76)) {
-               /* activate again */
-               ret = __mt7921_mcu_fw_pmctrl(dev);
-               if (!ret)
-                       ret = __mt7921_mcu_drv_pmctrl(dev);
-       }
-
        release_firmware(fw);
 
        return ret;
@@ -662,6 +655,13 @@ static int mt7921_load_firmware(struct mt7921_dev *dev)
        if (ret)
                return ret;
 
+       if (mt76_is_sdio(&dev->mt76)) {
+               /* activate again */
+               ret = __mt7921_mcu_fw_pmctrl(dev);
+               if (!ret)
+                       ret = __mt7921_mcu_drv_pmctrl(dev);
+       }
+
        ret = mt7921_load_ram(dev);
        if (ret)
                return ret;