提交 dc0fa32e 编写于 作者: M Miaoqian Lin 提交者: Zheng Zengkai

media: exynos4-is: Fix PM disable depth imbalance in fimc_is_probe

stable inclusion
from stable-v5.10.121
commit 8e4e0c4ac55e0afa780817acc4fd3accdacdcc64
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6CQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8e4e0c4ac55e0afa780817acc4fd3accdacdcc64

--------------------------------

[ Upstream commit 5c0db68c ]

If probe fails then we need to call pm_runtime_disable() to balance
out the previous pm_runtime_enable() call.

Fixes: 9a761e43 ("[media] exynos4-is: Add Exynos4x12 FIMC-IS driver")
Signed-off-by: NMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: NKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Reviewed-by: NAlim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 37d6b10a
......@@ -830,7 +830,7 @@ static int fimc_is_probe(struct platform_device *pdev)
ret = pm_runtime_resume_and_get(dev);
if (ret < 0)
goto err_irq;
goto err_pm_disable;
vb2_dma_contig_set_max_seg_size(dev, DMA_BIT_MASK(32));
......@@ -864,6 +864,8 @@ static int fimc_is_probe(struct platform_device *pdev)
pm_runtime_put_noidle(dev);
if (!pm_runtime_enabled(dev))
fimc_is_runtime_suspend(dev);
err_pm_disable:
pm_runtime_disable(dev);
err_irq:
free_irq(is->irq, is);
err_clk:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册