lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 158/274] media: sun8i: Fix an error handling path in 'deinterlace_runtime_resume()'
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 62eedb356188376acd0368384a9b294d5180c00b ]

    It is spurious to call 'clk_disable_unprepare()' when
    'clk_prepare_enable()' has not been called yet.
    Re-order the error handling path to avoid it.

    Fixes: a4260ea49547 ("media: sun4i: Add H3 deinterlace driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Acked-by: Chen-Yu Tsai <wens@csie.org>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    [hverkuil-cisco@xs4all.nl: err_exlusive_rate -> err_exclusive_rate]
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
    index d78f6593ddd1..ba5d07886607 100644
    --- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
    +++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
    @@ -941,7 +941,7 @@ static int deinterlace_runtime_resume(struct device *device)
    if (ret) {
    dev_err(dev->dev, "Failed to enable bus clock\n");

    - goto err_exlusive_rate;
    + goto err_exclusive_rate;
    }

    ret = clk_prepare_enable(dev->mod_clk);
    @@ -969,14 +969,14 @@ static int deinterlace_runtime_resume(struct device *device)

    return 0;

    -err_exlusive_rate:
    - clk_rate_exclusive_put(dev->mod_clk);
    err_ram_clk:
    clk_disable_unprepare(dev->ram_clk);
    err_mod_clk:
    clk_disable_unprepare(dev->mod_clk);
    err_bus_clk:
    clk_disable_unprepare(dev->bus_clk);
    +err_exclusive_rate:
    + clk_rate_exclusive_put(dev->mod_clk);

    return ret;
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:55    [W:4.151 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site