diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2016-07-20 14:19:03 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-01-27 15:31:32 +0100 |
| commit | 12030f489ef87dd879400d65381482a1f2177adc (patch) | |
| tree | a5e91b1c69730f3d897aed04e6030acdc8cfe4c6 | |
| parent | [media] media: entity: Fix stream count check (diff) | |
| download | linux-12030f489ef87dd879400d65381482a1f2177adc.tar.xz linux-12030f489ef87dd879400d65381482a1f2177adc.zip | |
[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 <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | drivers/media/media-entity.c | 8 |
1 files 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 @@ 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; |