From: Sakari Ailus <sakari.ailus@linux.intel.com>
Date: Wed, 20 Jul 2016 11:32:49 +0000 (-0300)
Subject: [media] media: entity: Fix stream count check
X-Git-Tag: v4.11-rc1~132^2~226
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f;p=linux.git

[media] media: entity: Fix stream count check

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.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 042a91811b02..0408d8641eff 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -470,7 +470,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;