Skip to content

Commit

Permalink
media: stm32-dcmi: Fix a reference count leak
Browse files Browse the repository at this point in the history
[ Upstream commit 88f50a0 ]

Calling pm_runtime_get_sync increments the counter even in case of
failure, causing incorrect ref count if pm_runtime_put is not
called in error handling paths. Thus replace the jump target
"err_release_buffers" by "err_pm_putw".

Fixes: 152e0bf ("media: stm32-dcmi: add power saving support")
Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
QiushiWu authored and gregkh committed Oct 29, 2020
1 parent f9225e4 commit 41d0249
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/media/platform/stm32/stm32-dcmi.c
Expand Up @@ -733,7 +733,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)
if (ret < 0) {
dev_err(dcmi->dev, "%s: Failed to start streaming, cannot get sync (%d)\n",
__func__, ret);
goto err_release_buffers;
goto err_pm_put;
}

ret = media_pipeline_start(&dcmi->vdev->entity, &dcmi->pipeline);
Expand Down Expand Up @@ -837,8 +837,6 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)

err_pm_put:
pm_runtime_put(dcmi->dev);

err_release_buffers:
spin_lock_irq(&dcmi->irqlock);
/*
* Return all buffers to vb2 in QUEUED state.
Expand Down

0 comments on commit 41d0249

Please sign in to comment.