openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: platform: add missing put_device() call in mtk_jpeg_probe() and mtk_jpeg_remove() 

if mtk_jpeg_clk_init() succeed, mtk_jpeg_probe() and mtk_jpeg_remove()
doesn't have a corresponding put_device(). Thus add a new helper
mtk_jpeg_clk_release() to fix it.

Fixes: b2f0d2724b ("[media] vcodec: mediatek: Add Mediatek JPEG Decoder Driver")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Yu Kuai 2020-11-04 13:41:36 +01:00 committed by Mauro Carvalho Chehab
parent f50613c1a8
commit 0d72f48999
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
View File

@ -1332,6 +1332,12 @@ static void mtk_jpeg_job_timeout_work(struct work_struct *work)
v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR); v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx); v4l2_m2m_job_finish(jpeg->m2m_dev, ctx->fh.m2m_ctx);
} }
static inline void mtk_jpeg_clk_release(struct mtk_jpeg_dev *jpeg)
{
put_device(jpeg->larb);
}
static int mtk_jpeg_probe(struct platform_device *pdev) static int mtk_jpeg_probe(struct platform_device *pdev)
{ {
struct mtk_jpeg_dev *jpeg; struct mtk_jpeg_dev *jpeg;
@ -1436,6 +1442,7 @@ static int mtk_jpeg_probe(struct platform_device *pdev)
v4l2_device_unregister(&jpeg->v4l2_dev); v4l2_device_unregister(&jpeg->v4l2_dev);
err_dev_register: err_dev_register:
mtk_jpeg_clk_release(jpeg);
err_clk_init: err_clk_init:
@ -1453,6 +1460,7 @@ static int mtk_jpeg_remove(struct platform_device *pdev)
video_device_release(jpeg->vdev); video_device_release(jpeg->vdev);
v4l2_m2m_release(jpeg->m2m_dev); v4l2_m2m_release(jpeg->m2m_dev);
v4l2_device_unregister(&jpeg->v4l2_dev); v4l2_device_unregister(&jpeg->v4l2_dev);
mtk_jpeg_clk_release(jpeg);
return 0; return 0;
} }