From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 12 Jul 2017 20:07:08 +0000 (-0300)
Subject: media: cec: cec_transmit_attempt_done: ignore CEC_TX_STATUS_MAX_RETRIES
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bd34ca8758d0ee9b13c0c067a956b0e9eb247d18;p=linux.git

media: cec: cec_transmit_attempt_done: ignore CEC_TX_STATUS_MAX_RETRIES

The switch in cec_transmit_attempt_done() should ignore the
CEC_TX_STATUS_MAX_RETRIES status bit.

Calling this function with e.g. CEC_TX_STATUS_NACK | CEC_TX_STATUS_MAX_RETRIES
is perfectly legal and should not trigger the WARN(1).

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---

diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
index bf45977b2823b..d596b601ff42a 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
@@ -559,7 +559,7 @@ EXPORT_SYMBOL_GPL(cec_transmit_done);
 
 void cec_transmit_attempt_done(struct cec_adapter *adap, u8 status)
 {
-	switch (status) {
+	switch (status & ~CEC_TX_STATUS_MAX_RETRIES) {
 	case CEC_TX_STATUS_OK:
 		cec_transmit_done(adap, status, 0, 0, 0, 0);
 		return;