mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
media: mtk-jpeg: Fix runtime PM leak in mtk_jpegenc_worker()
pm_runtime_get_sync() leaves the device's runtime PM usage count
incremented even when it fails, and a failed clk_prepare_enable()
drops the reference as well. mtk_jpegenc_worker() jumps to enc_end
in both cases, which does not call pm_runtime_put(), so the
reference taken by the successful resume is leaked.
Use pm_runtime_resume_and_get() for the resume failure and release
the reference explicitly when the clock cannot be enabled, as
mtk_jpegdec_worker() already does.
Fixes: 5fb1c2361e ("mtk-jpegenc: add jpeg encode worker interface")
Cc: stable@vger.kernel.org
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
befd450617
commit
7ec8fd17f3
|
|
@ -1623,7 +1623,7 @@ static void mtk_jpegenc_worker(struct work_struct *work)
|
|||
v4l2_m2m_buf_copy_metadata(src_buf, dst_buf);
|
||||
|
||||
mtk_jpegenc_set_hw_param(ctx, hw_id, src_buf, dst_buf);
|
||||
ret = pm_runtime_get_sync(comp_jpeg[hw_id]->dev);
|
||||
ret = pm_runtime_resume_and_get(comp_jpeg[hw_id]->dev);
|
||||
if (ret < 0) {
|
||||
dev_err(jpeg->dev, "%s : %d, pm_runtime_get_sync fail !!!\n",
|
||||
__func__, __LINE__);
|
||||
|
|
@ -1634,6 +1634,7 @@ static void mtk_jpegenc_worker(struct work_struct *work)
|
|||
if (ret) {
|
||||
dev_err(jpeg->dev, "%s : %d, jpegenc clk_prepare_enable fail\n",
|
||||
__func__, __LINE__);
|
||||
pm_runtime_put(comp_jpeg[hw_id]->dev);
|
||||
goto enc_end;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user