aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/media-entity.c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@linux.intel.com>2016-07-20 08:32:49 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-01-27 12:23:19 -0200
commit41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f (patch)
tree5059730f6ca667b4ca347232d9ee01a71e0b77aa /drivers/media/media-entity.c
parentbcb63314e2c23f1ed622418b65f9409512659c73 (diff)
download96b-common-41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f.tar.gz
[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>
Diffstat (limited to 'drivers/media/media-entity.c')
-rw-r--r--drivers/media/media-entity.c2
1 files changed, 1 insertions, 1 deletions
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 @@ error:
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;