aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/media-entity.c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2015-12-16 15:32:23 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 12:19:18 -0200
commit106b9907c368e32d0b01d8ea682c44ef811e6e36 (patch)
tree00af7a1a7f287d500805c27a88d0d85d687370c0 /drivers/media/media-entity.c
parente03d220336dd69292370393f5eee98ac17eda308 (diff)
download96b-common-106b9907c368e32d0b01d8ea682c44ef811e6e36.tar.gz
[media] media: Use the new media graph walk interface
The media graph walk requires initialisation and cleanup soon. Update the users to perform the soon necessary API calls. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/media-entity.c')
-rw-r--r--drivers/media/media-entity.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 9bf96c71374e..85af715d2a20 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -383,7 +383,13 @@ __must_check int media_entity_pipeline_start(struct media_entity *entity,
mutex_lock(&mdev->graph_mutex);
- media_entity_graph_walk_start(graph, entity);
+ ret = media_entity_graph_walk_init(&pipe->graph, mdev);
+ if (ret) {
+ mutex_unlock(&mdev->graph_mutex);
+ return ret;
+ }
+
+ media_entity_graph_walk_start(&pipe->graph, entity);
while ((entity = media_entity_graph_walk_next(graph))) {
DECLARE_BITMAP(active, MEDIA_ENTITY_MAX_PADS);
@@ -481,6 +487,8 @@ error:
break;
}
+ media_entity_graph_walk_cleanup(graph);
+
mutex_unlock(&mdev->graph_mutex);
return ret;
@@ -502,6 +510,8 @@ void media_entity_pipeline_stop(struct media_entity *entity)
entity->pipe = NULL;
}
+ media_entity_graph_walk_cleanup(graph);
+
mutex_unlock(&mdev->graph_mutex);
}
EXPORT_SYMBOL_GPL(media_entity_pipeline_stop);