raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

memory: mtk-smi: Fix PM usage counter unbalance in mtk_smi ops

Browse Source 
[ Upstream commit a2d522ff0f ]

pm_runtime_get_sync will increment pm usage counter
even it failed. Forgetting to putting operation will
result in reference leak here. We fix it by replacing
it with pm_runtime_resume_and_get to keep usage counter
balanced.

Fixes: 4f0a1a1ae3 ("memory: mtk-smi: Invoke pm runtime_callback to enable clocks")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20201123102118.3866195-1-zhangqilong3@huawei.com
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Zhang Qilong
2020-11-23 18:21:18 +08:00
committed by Greg Kroah-Hartman
parent 587b9cc3c0
commit ec621e8442
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/memory/mtk-smi.c
View File

@@ -130,7 +130,7 @@ static void mtk_smi_clk_disable(const struct mtk_smi *smi)
int mtk_smi_larb_get(struct device *larbdev) int mtk_smi_larb_get(struct device *larbdev)
{ {
int ret = pm_runtime_get_sync(larbdev); int ret = pm_runtime_resume_and_get(larbdev);
return (ret < 0) ? ret : 0; return (ret < 0) ? ret : 0;
} }
@@ -366,7 +366,7 @@ static int __maybe_unused mtk_smi_larb_resume(struct device *dev)
int ret; int ret;
/* Power on smi-common. */ /* Power on smi-common. */
ret = pm_runtime_get_sync(larb->smi_common_dev); ret = pm_runtime_resume_and_get(larb->smi_common_dev);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to pm get for smi-common(%d).\n", ret); dev_err(dev, "Failed to pm get for smi-common(%d).\n", ret);
return ret; return ret;