Commit 43d0d3c5 authored Jul 12, 2016 by Wei Yongjun Committed by Mauro Carvalho Chehab May 11, 2018

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



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>

parent 5377f3c3

drivers/media/platform/rcar_jpu.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -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: