From: Sakari Ailus <sakari.ai...@linux.intel.com>

A single entity may contain multiple pipelines. Only add pads that were
connected to the pad through which the entity was reached to the pipeline.

Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+rene...@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo+rene...@jmondi.org>
---
 drivers/media/media-entity.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 5d21ecaaaf4b..b48dd1e7c805 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -466,7 +466,7 @@ __must_check int __media_pipeline_start(struct media_pad 
*pad,
                DECLARE_BITMAP(active, MEDIA_ENTITY_MAX_PADS);
                DECLARE_BITMAP(has_no_links, MEDIA_ENTITY_MAX_PADS);
 
-               media_entity_for_each_pad(entity, iter) {
+               media_entity_for_each_routed_pad(pad, iter) {
                        if (iter->pipe && WARN_ON(iter->pipe != pipe))
                                ret = -EBUSY;
                        else
@@ -551,10 +551,9 @@ __must_check int __media_pipeline_start(struct media_pad 
*pad,
        media_graph_walk_start(graph, pad_err);
 
        while ((pad_err = media_graph_walk_next(graph))) {
-               struct media_entity *entity = pad->entity;
                struct media_pad *iter;
 
-               media_entity_for_each_pad(entity, iter) {
+               media_entity_for_each_routed_pad(pad, iter) {
                        /* Sanity check for negative stream_count */
                        if (!WARN_ON_ONCE(iter->stream_count <= 0)) {
                                --iter->stream_count;
@@ -607,10 +606,9 @@ void __media_pipeline_stop(struct media_pad *pad)
        media_graph_walk_start(graph, pad);
 
        while ((pad = media_graph_walk_next(graph))) {
-               struct media_entity *entity = pad->entity;
                struct media_pad *iter;
 
-               media_entity_for_each_pad(entity, iter) {
+               media_entity_for_each_routed_pad(pad, iter) {
                        /* Sanity check for negative stream_count */
                        if (!WARN_ON_ONCE(iter->stream_count <= 0)) {
                                iter->stream_count--;
-- 
2.20.1

Reply via email to