There's a sanity check for the stream count remaining positive or zero on
error path, but instead of performing the check on the traversed entity it
is performed on the entity where traversal ends. Fix this.

Fixes: commit 3801bc7d1b8d ("[media] media: Media Controller fix to not let 
stream_count go negative")
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
---
 drivers/media/media-entity.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index f9f723f..e3b7ecd 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -474,7 +474,7 @@ __must_check int __media_entity_pipeline_start(struct 
media_entity *entity,
 
        while ((entity_err = media_entity_graph_walk_next(graph))) {
                /* don't let the stream_count go negative */
-               if (entity->stream_count > 0) {
+               if (entity_err->stream_count > 0) {
                        entity_err->stream_count--;
                        if (entity_err->stream_count == 0)
                                entity_err->pipe = NULL;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to