|
@@ -493,21 +493,17 @@ static int s3c_camif_probe(struct platform_device *pdev)
|
|
|
if (ret < 0)
|
|
|
goto err_sens;
|
|
|
|
|
|
- mutex_lock(&camif->media_dev.graph_mutex);
|
|
|
-
|
|
|
ret = v4l2_device_register_subdev_nodes(&camif->v4l2_dev);
|
|
|
if (ret < 0)
|
|
|
- goto err_unlock;
|
|
|
+ goto err_sens;
|
|
|
|
|
|
ret = camif_register_video_nodes(camif);
|
|
|
if (ret < 0)
|
|
|
- goto err_unlock;
|
|
|
+ goto err_sens;
|
|
|
|
|
|
ret = camif_create_media_links(camif);
|
|
|
if (ret < 0)
|
|
|
- goto err_unlock;
|
|
|
-
|
|
|
- mutex_unlock(&camif->media_dev.graph_mutex);
|
|
|
+ goto err_sens;
|
|
|
|
|
|
ret = media_device_register(&camif->media_dev);
|
|
|
if (ret < 0)
|
|
@@ -516,8 +512,6 @@ static int s3c_camif_probe(struct platform_device *pdev)
|
|
|
pm_runtime_put(dev);
|
|
|
return 0;
|
|
|
|
|
|
-err_unlock:
|
|
|
- mutex_unlock(&camif->media_dev.graph_mutex);
|
|
|
err_sens:
|
|
|
v4l2_device_unregister(&camif->v4l2_dev);
|
|
|
media_device_unregister(&camif->media_dev);
|