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@xxxxxxxxxxxxxxx>
---
drivers/staging/media/davinci_vpfe/vpfe_video.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 87048a1..2511614 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -143,7 +143,7 @@ static void vpfe_prepare_pipeline(struct vpfe_video_device *video)
else
pipe->outputs[pipe->output_num++] = video;
- 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))) {
if (entity == &video->video_dev.entity)
@@ -156,7 +156,7 @@ static void vpfe_prepare_pipeline(struct vpfe_video_device *video)
else
pipe->outputs[pipe->output_num++] = far_end;
}
- mutex_unlock(&mdev->graph_mutex);
+ spin_unlock(&mdev->graph_lock);
}
/* update pipe state selected by user */
@@ -289,7 +289,7 @@ static int vpfe_pipeline_enable(struct vpfe_pipeline *pipe)
entity = &pipe->inputs[0]->video_dev.entity;
mdev = entity->parent;
- 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))) {
@@ -300,7 +300,7 @@ static int vpfe_pipeline_enable(struct vpfe_pipeline *pipe)
if (ret < 0 && ret != -ENOIOCTLCMD)
break;
}
- mutex_unlock(&mdev->graph_mutex);
+ spin_unlock(&mdev->graph_lock);
return ret;
}
@@ -329,7 +329,7 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe)
entity = &pipe->inputs[0]->video_dev.entity;
mdev = entity->parent;
- 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))) {
@@ -341,7 +341,7 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe)
if (ret < 0 && ret != -ENOIOCTLCMD)
break;
}
- mutex_unlock(&mdev->graph_mutex);
+ spin_unlock(&mdev->graph_lock);
return ret ? -ETIMEDOUT : 0;
}
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
