OSDN Git Service

[media] media: entity: Fix stream count check
authorSakari Ailus <sakari.ailus@linux.intel.com>
Wed, 20 Jul 2016 11:32:49 +0000 (08:32 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 27 Jan 2017 14:23:19 +0000 (12:23 -0200)
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>
drivers/media/media-entity.c

index 042a918..0408d86 100644 (file)
@@ -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;