lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 051/255] media: cedrus: Set the platform driver data earlier
    Date
    From: Dmitry Osipenko <dmitry.osipenko@collabora.com>

    commit 708938f8495147fe2e77a9a3e1015d8e6899323e upstream.

    The cedrus_hw_resume() crashes with NULL deference on driver probe if
    runtime PM is disabled because it uses platform data that hasn't been
    set up yet. Fix this by setting the platform data earlier during probe.

    Cc: stable@vger.kernel.org
    Fixes: 50e761516f2b (media: platform: Add Cedrus VPU decoder driver)
    Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
    Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
    Reviewed-by: Samuel Holland <samuel@sholland.org>
    Acked-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/staging/media/sunxi/cedrus/cedrus.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/staging/media/sunxi/cedrus/cedrus.c
    +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
    @@ -323,6 +323,8 @@ static int cedrus_probe(struct platform_
    if (!dev)
    return -ENOMEM;

    + platform_set_drvdata(pdev, dev);
    +
    dev->vfd = cedrus_video_device;
    dev->dev = &pdev->dev;
    dev->pdev = pdev;
    @@ -392,8 +394,6 @@ static int cedrus_probe(struct platform_
    goto err_m2m_mc;
    }

    - platform_set_drvdata(pdev, dev);
    -
    return 0;

    err_m2m_mc:

    \
     
     \ /
      Last update: 2022-10-24 14:42    [W:2.215 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site