]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
wlcore: fix runtime pm imbalance in wlcore_regdomain_config
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Wed, 20 May 2020 12:46:47 +0000 (20:46 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 Oct 2020 11:18:07 +0000 (13:18 +0200)
[ Upstream commit 282a04bf1d8029eb98585cb5db3fd70fe8bc91f7 ]

pm_runtime_get_sync() increments the runtime PM usage counter even
the call returns an error code. Thus a pairing decrement is needed
on the error handling path to keep the counter balanced.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200520124649.10848-1-dinghao.liu@zju.edu.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/ti/wlcore/main.c

index 547ad538d8b6647b0c701879e364b4599001d96b..5f74cf821068d39c4a6a1eb5988cf43b212c7a51 100644 (file)
@@ -3658,8 +3658,10 @@ void wlcore_regdomain_config(struct wl1271 *wl)
                goto out;
 
        ret = pm_runtime_get_sync(wl->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_autosuspend(wl->dev);
                goto out;
+       }
 
        ret = wlcore_cmd_regdomain_config_locked(wl);
        if (ret < 0) {