From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Wed, 16 Dec 2015 13:32:23 +0000 (+0200)
Subject: [media] media: Use the new media graph walk interface
X-Git-Tag: v4.5-rc1~115^2~30
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=106b9907c368e32d0b01d8ea682c44ef811e6e36;p=karo-tx-linux.git

[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>
---

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);