Explorar o código

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>
Wei Yongjun %!s(int64=9) %!d(string=hai) anos
pai
achega
43d0d3c527
Modificáronse 1 ficheiros con 3 adicións e 1 borrados
  1. 3 1
      drivers/media/platform/rcar_jpu.c

+ 3 - 1
drivers/media/platform/rcar_jpu.c

@@ -1280,7 +1280,7 @@ static int jpu_open(struct file *file)
 		/* ...issue software reset */
 		/* ...issue software reset */
 		ret = jpu_reset(jpu);
 		ret = jpu_reset(jpu);
 		if (ret)
 		if (ret)
-			goto device_prepare_rollback;
+			goto jpu_reset_rollback;
 	}
 	}
 
 
 	jpu->ref_count++;
 	jpu->ref_count++;
@@ -1288,6 +1288,8 @@ static int jpu_open(struct file *file)
 	mutex_unlock(&jpu->mutex);
 	mutex_unlock(&jpu->mutex);
 	return 0;
 	return 0;
 
 
+jpu_reset_rollback:
+	clk_disable_unprepare(jpu->clk);
 device_prepare_rollback:
 device_prepare_rollback:
 	mutex_unlock(&jpu->mutex);
 	mutex_unlock(&jpu->mutex);
 v4l_prepare_rollback:
 v4l_prepare_rollback: