diff mbox

cec: fix comment and inverted condition

Message ID 574D9B9F.1000000@xs4all.nl (mailing list archive)
State Superseded, archived
Delegated to: Hans Verkuil
Headers

Commit Message

Hans Verkuil May 31, 2016, 2:11 p.m. UTC 
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.
---
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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);
 		}