[media] media: s3c-camif: fix deadlock on driver probe()
Commit 0c426c472b
("[media] media: Always
keep a graph walk large enough around") changed
media_device_register_entity() function to take mdev->graph_mutex. This
causes deadlock in driver probe, which calls (indirectly) this function
with ->graph_mutex taken. This patch removes taking ->graph_mutex in
driver probe to avoid deadlock. Other drivers don't take ->graph_mutex
for entity registration, so this change should be safe.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
243d4c0270
commit
9b15dfe054
|
@ -493,21 +493,17 @@ static int s3c_camif_probe(struct platform_device *pdev)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_sens;
|
goto err_sens;
|
||||||
|
|
||||||
mutex_lock(&camif->media_dev.graph_mutex);
|
|
||||||
|
|
||||||
ret = v4l2_device_register_subdev_nodes(&camif->v4l2_dev);
|
ret = v4l2_device_register_subdev_nodes(&camif->v4l2_dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_unlock;
|
goto err_sens;
|
||||||
|
|
||||||
ret = camif_register_video_nodes(camif);
|
ret = camif_register_video_nodes(camif);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_unlock;
|
goto err_sens;
|
||||||
|
|
||||||
ret = camif_create_media_links(camif);
|
ret = camif_create_media_links(camif);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_unlock;
|
goto err_sens;
|
||||||
|
|
||||||
mutex_unlock(&camif->media_dev.graph_mutex);
|
|
||||||
|
|
||||||
ret = media_device_register(&camif->media_dev);
|
ret = media_device_register(&camif->media_dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
|
@ -516,8 +512,6 @@ static int s3c_camif_probe(struct platform_device *pdev)
|
||||||
pm_runtime_put(dev);
|
pm_runtime_put(dev);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_unlock:
|
|
||||||
mutex_unlock(&camif->media_dev.graph_mutex);
|
|
||||||
err_sens:
|
err_sens:
|
||||||
v4l2_device_unregister(&camif->v4l2_dev);
|
v4l2_device_unregister(&camif->v4l2_dev);
|
||||||
media_device_unregister(&camif->media_dev);
|
media_device_unregister(&camif->media_dev);
|
||||||
|
|
Loading…
Reference in a new issue