From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: niklas.soderlund@ragnatech.se,
Sakari Ailus <sakari.ailus@linux.intel.com>
Subject: [PATCH 2/5] media: entity: Be vocal about failing sanity checks
Date: Fri, 25 Nov 2016 15:55:43 +0200 [thread overview]
Message-ID: <1480082146-25991-3-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1480082146-25991-1-git-send-email-sakari.ailus@linux.intel.com>
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>
---
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 da46706..82dd0bc 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -483,8 +483,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;
@@ -529,8 +529,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;
--
2.1.4
next prev parent reply other threads:[~2016-11-25 13:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-25 13:55 [PATCH 0/5] Media pipeline and graph walk cleanups and fixes Sakari Ailus
2016-11-25 13:55 ` [PATCH 1/5] media: entity: Fix stream count check Sakari Ailus
2016-12-08 14:09 ` Laurent Pinchart
2016-11-25 13:55 ` Sakari Ailus [this message]
2016-12-08 14:09 ` [PATCH 2/5] media: entity: Be vocal about failing sanity checks Laurent Pinchart
2016-11-25 13:55 ` [PATCH 3/5] media: Rename graph and pipeline structs and functions Sakari Ailus
2016-12-08 14:09 ` Laurent Pinchart
2016-11-25 13:55 ` [PATCH 4/5] media: entity: Split graph walk iteration into two functions Sakari Ailus
2016-12-08 14:02 ` Laurent Pinchart
2016-11-25 13:55 ` [PATCH 5/5] media: entity: Add debug information to graph walk Sakari Ailus
2016-12-08 14:10 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480082146-25991-3-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=linux-media@vger.kernel.org \
--cc=niklas.soderlund@ragnatech.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).