soc: mediatek: mtk-svs: Use pm_runtime_resume_and_get() in svs_init01()
authorShang XiaoJing <shangxiaojing@huawei.com>
Wed, 11 Jan 2023 07:45:18 +0000 (15:45 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 12:55:18 +0000 (13:55 +0100)
[ Upstream commit 37fa2aff8fe490771f2229b0f2fcd15796b1bfca ]

svs_init01() calls pm_runtime_get_sync() and added fail path as
svs_init01_finish to put usage_counter. However, pm_runtime_get_sync()
will increment usage_counter even it failed. Fix it by replacing it with
pm_runtime_resume_and_get() to keep usage counter balanced.

Fixes: 681a02e95000 ("soc: mediatek: SVS: introduce MTK SVS engine")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Signed-off-by: Roger Lu <roger.lu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230111074528.29354-5-roger.lu@mediatek.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/soc/mediatek/mtk-svs.c

index e0b8aa7..00526fd 100644 (file)
@@ -1324,7 +1324,7 @@ static int svs_init01(struct svs_platform *svsp)
                                svsb->pm_runtime_enabled_count++;
                        }
 
-                       ret = pm_runtime_get_sync(svsb->opp_dev);
+                       ret = pm_runtime_resume_and_get(svsb->opp_dev);
                        if (ret < 0) {
                                dev_err(svsb->dev, "mtcmos on fail: %d\n", ret);
                                goto svs_init01_resume_cpuidle;