| Message ID | 1448824823-10372-9-git-send-email-sakari.ailus@iki.fi (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Sun, 29 Nov 2015 21:20:09 +0200 Sakari Ailus <sakari.ailus@iki.fi> escreveu: Please add a description here. The patch itself looks ok. > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > --- > drivers/media/media-entity.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c > index bf3c31f..4161dc7 100644 > --- a/drivers/media/media-entity.c > +++ b/drivers/media/media-entity.c > @@ -492,7 +492,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); > @@ -590,6 +596,8 @@ error: > break; > } > > + media_entity_graph_walk_cleanup(graph); > + > mutex_unlock(&mdev->graph_mutex); > > return ret; > @@ -623,6 +631,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); -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index bf3c31f..4161dc7 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -492,7 +492,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); @@ -590,6 +596,8 @@ error: break; } + media_entity_graph_walk_cleanup(graph); + mutex_unlock(&mdev->graph_mutex); return ret; @@ -623,6 +631,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);
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/media-entity.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)