[media] media: entity: Be vocal about failing sanity checks
authorSakari Ailus <sakari.ailus@linux.intel.com>
Wed, 20 Jul 2016 12:19:03 +0000 (09:19 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 27 Jan 2017 14:31:32 +0000 (12:31 -0200)
Commit 3801bc7d1b8d ("[media] media: Media Controller fix to not let
stream_count go negative") added a sanity check for negative stream_count,
but a failure of the check remained silent. Make sure the failure is
noticed.

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 0408d8641effaf57c30ad0925f6cd4bc3ade8c30..d37260850e98615006018a8380c44ada2fbacba6 100644 (file)
@@ -469,8 +469,8 @@ error:
        media_entity_graph_walk_start(graph, entity_err);
 
        while ((entity_err = media_entity_graph_walk_next(graph))) {
-               /* don't let the stream_count go negative */
-               if (entity_err->stream_count > 0) {
+               /* Sanity check for negative stream_count */
+               if (!WARN_ON_ONCE(entity_err->stream_count <= 0)) {
                        entity_err->stream_count--;
                        if (entity_err->stream_count == 0)
                                entity_err->pipe = NULL;
@@ -515,8 +515,8 @@ void __media_entity_pipeline_stop(struct media_entity *entity)
        media_entity_graph_walk_start(graph, entity);
 
        while ((entity = media_entity_graph_walk_next(graph))) {
-               /* don't let the stream_count go negative */
-               if (entity->stream_count > 0) {
+               /* Sanity check for negative stream_count */
+               if (!WARN_ON_ONCE(entity->stream_count <= 0)) {
                        entity->stream_count--;
                        if (entity->stream_count == 0)
                                entity->pipe = NULL;