Update graph_mutex to graph_lock spinlock to be in sync with
the Media Conttroller change for the same.

Signed-off-by: Shuah Khan <shua...@osg.samsung.com>
---
 drivers/staging/media/omap4iss/iss.c       | 4 ++--
 drivers/staging/media/omap4iss/iss_video.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/omap4iss/iss.c 
b/drivers/staging/media/omap4iss/iss.c
index 9bfb725..017ef74 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -494,7 +494,7 @@ int omap4iss_pipeline_pm_use(struct media_entity *entity, 
int use)
        int change = use ? 1 : -1;
        int ret;
 
-       mutex_lock(&entity->parent->graph_mutex);
+       spin_lock(&entity->parent->graph_lock);
 
        /* Apply use count to node. */
        entity->use_count += change;
@@ -505,7 +505,7 @@ int omap4iss_pipeline_pm_use(struct media_entity *entity, 
int use)
        if (ret < 0)
                entity->use_count -= change;
 
-       mutex_unlock(&entity->parent->graph_mutex);
+       spin_unlock(&entity->parent->graph_lock);
 
        return ret;
 }
diff --git a/drivers/staging/media/omap4iss/iss_video.c 
b/drivers/staging/media/omap4iss/iss_video.c
index 85c54fe..2db9d16 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -210,7 +210,7 @@ iss_video_far_end(struct iss_video *video)
        struct media_device *mdev = entity->parent;
        struct iss_video *far_end = NULL;
 
-       mutex_lock(&mdev->graph_mutex);
+       spin_lock(&mdev->graph_lock);
        media_entity_graph_walk_start(&graph, entity);
 
        while ((entity = media_entity_graph_walk_next(&graph))) {
@@ -227,7 +227,7 @@ iss_video_far_end(struct iss_video *video)
                far_end = NULL;
        }
 
-       mutex_unlock(&mdev->graph_mutex);
+       spin_unlock(&mdev->graph_lock);
        return far_end;
 }
 
-- 
2.1.4

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to