diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2016-07-20 13:32:49 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-01-27 15:23:19 +0100 |
| commit | 41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f (patch) | |
| tree | 5059730f6ca667b4ca347232d9ee01a71e0b77aa /drivers/media/media-entity.c | |
| parent | [media] media: Drop FSF's postal address from the source code files (diff) | |
| download | linux-41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f.tar.xz linux-41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f.zip | |
[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.c | 2 |
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; |