From 12030f489ef87dd879400d65381482a1f2177adc Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Wed, 20 Jul 2016 09:19:03 -0300 Subject: [PATCH] [media] media: entity: Be vocal about failing sanity checks 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 Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- drivers/media/media-entity.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index 0408d8641eff..d37260850e98 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -469,8 +469,8 @@ __must_check int __media_entity_pipeline_start(struct media_entity *entity, 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;