lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 128/717] media: platform: add missing put_device() call in mtk_jpeg_probe() and mtk_jpeg_remove()
    Date
    From: Yu Kuai <yukuai3@huawei.com>

    [ Upstream commit 0d72f489995bb8565f6fe30539d4504c88356a9e ]

    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: b2f0d2724ba4 ("[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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
    index 106543391c460..88a23bce569d9 100644
    --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
    +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
    @@ -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_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)
    {
    struct mtk_jpeg_dev *jpeg;
    @@ -1436,6 +1442,7 @@ err_m2m_init:
    v4l2_device_unregister(&jpeg->v4l2_dev);

    err_dev_register:
    + mtk_jpeg_clk_release(jpeg);

    err_clk_init:

    @@ -1453,6 +1460,7 @@ static int mtk_jpeg_remove(struct platform_device *pdev)
    video_device_release(jpeg->vdev);
    v4l2_m2m_release(jpeg->m2m_dev);
    v4l2_device_unregister(&jpeg->v4l2_dev);
    + mtk_jpeg_clk_release(jpeg);

    return 0;
    }
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:09    [W:2.526 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site