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/media/platform/omap3isp/isp.c      | 4 ++--
 drivers/media/platform/omap3isp/ispvideo.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/omap3isp/isp.c 
b/drivers/media/platform/omap3isp/isp.c
index 18d0a87..a6e7f92 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -789,7 +789,7 @@ int omap3isp_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;
@@ -800,7 +800,7 @@ int omap3isp_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/media/platform/omap3isp/ispvideo.c 
b/drivers/media/platform/omap3isp/ispvideo.c
index d285af1..9ec3bb7 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -229,7 +229,7 @@ static int isp_video_get_graph_data(struct isp_video *video,
        struct media_device *mdev = entity->parent;
        struct isp_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))) {
@@ -251,7 +251,7 @@ static int isp_video_get_graph_data(struct isp_video *video,
                        far_end = __video;
        }
 
-       mutex_unlock(&mdev->graph_mutex);
+       spin_unlock(&mdev->graph_lock);
 
        if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
                pipe->input = far_end;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to