lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 093/144] media: rcar_jpu: Add missing clk_disable_unprepare() on error in jpu_open()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

    [ Upstream commit 43d0d3c52787df0221d1c52494daabd824fe84f1 ]

    Add the missing clk_disable_unprepare() before return from
    jpu_open() in the software reset error handling case.

    Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
    Acked-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
    Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
    Signed-off-by: Hans Verkuil <hansverk@cisco.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/media/platform/rcar_jpu.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/media/platform/rcar_jpu.c
    +++ b/drivers/media/platform/rcar_jpu.c
    @@ -1280,7 +1280,7 @@ static int jpu_open(struct file *file)
    /* ...issue software reset */
    ret = jpu_reset(jpu);
    if (ret)
    - goto device_prepare_rollback;
    + goto jpu_reset_rollback;
    }

    jpu->ref_count++;
    @@ -1288,6 +1288,8 @@ static int jpu_open(struct file *file)
    mutex_unlock(&jpu->mutex);
    return 0;

    +jpu_reset_rollback:
    + clk_disable_unprepare(jpu->clk);
    device_prepare_rollback:
    mutex_unlock(&jpu->mutex);
    v4l_prepare_rollback:

    \
     
     \ /
      Last update: 2018-08-01 19:42    [W:4.075 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site