lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 367/772] media: exynos4-is: Fix PM disable depth imbalance in fimc_is_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 5c0db68ce0faeb000c3540d095eb272d671a6e03 ]

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

    Fixes: 9a761e436843 ("[media] exynos4-is: Add Exynos4x12 FIMC-IS driver")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
    Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
    Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/exynos4-is/fimc-is.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
    index e55e411038f4..81b290dace3a 100644
    --- a/drivers/media/platform/exynos4-is/fimc-is.c
    +++ b/drivers/media/platform/exynos4-is/fimc-is.c
    @@ -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:
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 23:08    [W:4.044 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site