wifi: wlcore: fix unbalanced pm_runtime calls

[ Upstream commit 996c934c8c196144af386c4385f61fcd5349af28 ]

If firmware boot failes, runtime pm is put too often:
[12092.708099] wlcore: ERROR firmware boot failed despite 3 retries
[12092.708099] wl18xx_driver wl18xx.1.auto: Runtime PM usage count underflow!
Fix that by redirecting all error gotos before runtime_get so that runtime is
not put.

Fixes: c40aad28a3cf ("wlcore: Make sure firmware is initialized in wl1271_op_add_interface()")
Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
Reviewed-by: Michael Nemanov <michael.nemanov@ti.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20250104195507.402673-1-akemnade@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 6e402d62dbe4a783df2fe292c227570649f4adac..109c51e4979266eb1316b99c11e09d36e7a99d05 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -2552,24 +2552,24 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
        if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags) ||
            test_bit(WLVIF_FLAG_INITIALIZED, &wlvif->flags)) {
                ret = -EBUSY;
-               goto out;
+               goto out_unlock;
        }
 
 
        ret = wl12xx_init_vif_data(wl, vif);
        if (ret < 0)
-               goto out;
+               goto out_unlock;
 
        wlvif->wl = wl;
        role_type = wl12xx_get_role_type(wl, wlvif);
        if (role_type == WL12XX_INVALID_ROLE_TYPE) {
                ret = -EINVAL;
-               goto out;
+               goto out_unlock;
        }
 
        ret = wlcore_allocate_hw_queue_base(wl, wlvif);
        if (ret < 0)
-               goto out;
+               goto out_unlock;
 
        /*
         * TODO: after the nvs issue will be solved, move this block
@@ -2584,7 +2584,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
 
                ret = wl12xx_init_fw(wl);
                if (ret < 0)
-                       goto out;
+                       goto out_unlock;
        }
 
        /*