diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2016-07-20 11:32:49 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-12 13:01:02 (GMT) |
| commit | b96976c1a87bc48ddd5f32566c682cd376e4b785 (patch) | |
| tree | 28998367aabfedc6670a0a50df25719f916bf75c | |
| parent | 3693042f1c9f9145a08100f92c09d790c6b9d848 (diff) | |
| download | linux-b96976c1a87bc48ddd5f32566c682cd376e4b785.tar.xz | |
media: entity: Fix stream count check
commit 41387a59c8fd55975c6a26cc12fc5c9ca61fcc0f upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 c68239e..98b067b 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -468,7 +468,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; |