Update graph_mutex to graph_lock spinlock to be in sync with the Media Conttroller change for the same.
Signed-off-by: Shuah Khan shuahkh@osg.samsung.com --- drivers/media/platform/s3c-camif/camif-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c index f47b332..90dd781 100644 --- a/drivers/media/platform/s3c-camif/camif-core.c +++ b/drivers/media/platform/s3c-camif/camif-core.c @@ -495,7 +495,7 @@ static int s3c_camif_probe(struct platform_device *pdev) if (ret < 0) goto err_sens;
- mutex_lock(&camif->media_dev.graph_mutex); + spin_lock(&camif->media_dev.graph_lock);
ret = v4l2_device_register_subdev_nodes(&camif->v4l2_dev); if (ret < 0) @@ -509,12 +509,12 @@ static int s3c_camif_probe(struct platform_device *pdev) if (ret < 0) goto err_unlock;
- mutex_unlock(&camif->media_dev.graph_mutex); + spin_unlock(&camif->media_dev.graph_lock); pm_runtime_put(dev); return 0;
err_unlock: - mutex_unlock(&camif->media_dev.graph_mutex); + spin_unlock(&camif->media_dev.graph_lock); err_sens: v4l2_device_unregister(&camif->v4l2_dev); media_device_unregister(&camif->media_dev);