Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac791f19 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: cec-pin: fix broken tx_ignore_nack_until_eom error injection 



If the tx_ignore_nack_until_eom error injection was activated,
then tx_nacked was never set instead of setting it when the last
byte of the message was transmitted.

As a result the transmit was marked as OK, when it should have
been NACKed.

Modify the condition so that it always sets tx_nacked when the
last byte of the message was transmitted.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org>      # for v4.17 and up
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 02e6d2ea

drivers/media/cec/cec-pin.c

+3 −2
Original line number Diff line number Diff line
@@ -601,8 +601,9 @@ static void cec_pin_tx_states(struct cec_pin *pin, ktime_t ts) 
			break;

		/* Was the message ACKed? */

		ack = cec_msg_is_broadcast(&pin->tx_msg) ? v : !v;

		if (!ack && !pin->tx_ignore_nack_until_eom &&

		    pin->tx_bit / 10 < pin->tx_msg.len && !pin->tx_post_eom) {

		if (!ack && (!pin->tx_ignore_nack_until_eom ||

		    pin->tx_bit / 10 == pin->tx_msg.len - 1) &&

		    !pin->tx_post_eom) {

			/*

			 * Note: the CEC spec is ambiguous regarding

			 * what action to take when a NACK appears