Skip to content
Snippets Groups Projects
Commit 11ebf58e authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Nicolas Dufresne
Browse files

media: cedrus: Set the platform driver data earlier


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
Signed-off-by: default avatarDmitry Osipenko <dmitry.osipenko@collabora.com>
parent ef022ed9
No related branches found
No related tags found
No related merge requests found
...@@ -448,6 +448,8 @@ static int cedrus_probe(struct platform_device *pdev) ...@@ -448,6 +448,8 @@ static int cedrus_probe(struct platform_device *pdev)
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;
platform_set_drvdata(pdev, dev);
dev->vfd = cedrus_video_device; dev->vfd = cedrus_video_device;
dev->dev = &pdev->dev; dev->dev = &pdev->dev;
dev->pdev = pdev; dev->pdev = pdev;
...@@ -521,8 +523,6 @@ static int cedrus_probe(struct platform_device *pdev) ...@@ -521,8 +523,6 @@ static int cedrus_probe(struct platform_device *pdev)
goto err_m2m_mc; goto err_m2m_mc;
} }
platform_set_drvdata(pdev, dev);
return 0; return 0;
err_m2m_mc: err_m2m_mc:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment