mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
media: ti: cal: Fix wrong goto on error path
If pm_runtime_resume_and_get() fails, we should unprepare the context, but currently we skip that as we goto to a later line. Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
parent
0c1ab3ce04
commit
a5b18fd769
1 changed files with 2 additions and 2 deletions
|
@ -744,7 +744,7 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
|
|||
|
||||
ret = pm_runtime_resume_and_get(ctx->cal->dev);
|
||||
if (ret < 0)
|
||||
goto error_pipeline;
|
||||
goto error_unprepare;
|
||||
|
||||
cal_ctx_set_dma_addr(ctx, addr);
|
||||
cal_ctx_start(ctx);
|
||||
|
@ -761,8 +761,8 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count)
|
|||
error_stop:
|
||||
cal_ctx_stop(ctx);
|
||||
pm_runtime_put_sync(ctx->cal->dev);
|
||||
error_unprepare:
|
||||
cal_ctx_unprepare(ctx);
|
||||
|
||||
error_pipeline:
|
||||
video_device_pipeline_stop(&ctx->vdev);
|
||||
error_release_buffers:
|
||||
|
|
Loading…
Add table
Reference in a new issue