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.15 322/667] media: atmel: atmel-isc: Fix PM disable depth imbalance in atmel_isc_probe
    Date
    From: Miaoqian Lin <linmq006@gmail.com>

    [ Upstream commit 395829c61a196a0821a703a49c4db3ac51daff73 ]

    The pm_runtime_enable will decrease power disable depth.
    If the probe fails, we should use pm_runtime_disable() to balance
    pm_runtime_enable().

    Fixes: 0a0e265515db ("media: atmel: atmel-isc: split driver into driver base and isc")
    Signed-off-by: Miaoqian Lin <linmq006@gmail.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/atmel/atmel-sama5d2-isc.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
    index e29a9193bac8..c8ed9315ef31 100644
    --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
    +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
    @@ -537,7 +537,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
    ret = clk_prepare_enable(isc->ispck);
    if (ret) {
    dev_err(dev, "failed to enable ispck: %d\n", ret);
    - goto cleanup_subdev;
    + goto disable_pm;
    }

    /* ispck should be greater or equal to hclock */
    @@ -555,6 +555,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
    unprepare_clk:
    clk_disable_unprepare(isc->ispck);

    +disable_pm:
    + pm_runtime_disable(dev);
    +
    cleanup_subdev:
    isc_subdev_cleanup(isc);

    --
    2.35.1


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