public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
From: Hans Verkuil <hverkuil@xs4all.nl>
To: linux-media <linux-media@vger.kernel.org>
Subject: [PATCH] cec: fix comment and inverted condition
Date: Tue, 31 May 2016 16:11:43 +0200	[thread overview]
Message-ID: <574D9B9F.1000000@xs4all.nl> (raw)

The inverted condition caused received events to be replied to with
Feature Abort, even though they were the reply to an earlier transmit
that the caller was waiting for and so they would be processed and
Feature Abort was inappropriate.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---

This patch sits on top of the CEC pull request.
---
diff --git a/drivers/staging/media/cec/cec.c b/drivers/staging/media/cec/cec.c
index c2a876e..65a3cb3 100644
--- a/drivers/staging/media/cec/cec.c
+++ b/drivers/staging/media/cec/cec.c
@@ -1143,13 +1143,13 @@ static int cec_receive_notify(struct cec_adapter *adap, struct cec_msg *msg,
 	}

 skip_processing:
-	/* If this was not a reply, then we're done */
+	/* If this was a reply, then we're done */
 	if (is_reply)
 		return 0;

 	/*
 	 * Send to the exclusive follower if there is one, otherwise send
-	 * to all followerd.
+	 * to all followers.
 	 */
 	if (adap->cec_follower)
 		cec_queue_msg_fh(adap->cec_follower, msg);
@@ -1791,7 +1791,7 @@ static long cec_ioctl(struct file *filp, unsigned cmd, unsigned long arg)
 		} else if (cec_is_busy(adap, fh)) {
 			err = -EBUSY;
 		} else {
-			if (block || !msg.reply)
+			if (!block || !msg.reply)
 				fh = NULL;
 			err = cec_transmit_msg_fh(adap, &msg, fh, block);
 		}

                 reply	other threads:[~2016-05-31 14:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=574D9B9F.1000000@xs4all.nl \
    --to=hverkuil@xs4all.nl \
    --cc=linux-media@vger.kernel.org \
    /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