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 1/5] media: entity: Fix stream count check
Date: Fri, 25 Nov 2016 15:55:42 +0200 [thread overview]
Message-ID: <1480082146-25991-2-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1480082146-25991-1-git-send-email-sakari.ailus@linux.intel.com>
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>
---
drivers/media/media-entity.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 58d9fa6..da46706 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -484,7 +484,7 @@ __must_check int __media_entity_pipeline_start(struct media_entity *entity,
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;
--
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 ` Sakari Ailus [this message]
2016-12-08 14:09 ` [PATCH 1/5] media: entity: Fix stream count check Laurent Pinchart
2016-11-25 13:55 ` [PATCH 2/5] media: entity: Be vocal about failing sanity checks Sakari Ailus
2016-12-08 14:09 ` 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-2-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).