media: rcar_jpu: Add missing clk_disable_unprepare() on error in jpu_open()

[ 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>

diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 070bac36d766891dabeb01e1f1bf064eb989de58..2e2b8c409150547d9c998a10bf8f55ff881a10a2 100644 (file)
--- 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: