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

media: cec-adap.c: stop trying LAs on CEC_TX_STATUS_TIMEOUT 



If, while trying to claim a free logical address, a POLL message
times out, then abort this process. A CEC_TX_STATUS_TIMEOUT
should be handled the same as a CEC_TX_STATUS_ABORTED.

This avoids a situation where transmits time out due to a
driver or hardware bug and it takes ages before the attempt
to find available free logical addresses finishes.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 498946cf

drivers/media/cec/core/cec-adap.c

+3 −2
Original line number Diff line number Diff line
@@ -1282,10 +1282,11 @@ static int cec_config_log_addr(struct cec_adapter *adap, 
			return err;



		/*

		 * The message was aborted due to a disconnect or

		 * The message was aborted or timed out due to a disconnect or

		 * unconfigure, just bail out.

		 */

		if (msg.tx_status & CEC_TX_STATUS_ABORTED)

		if (msg.tx_status &

		    (CEC_TX_STATUS_ABORTED | CEC_TX_STATUS_TIMEOUT))

			return -EINTR;

		if (msg.tx_status & CEC_TX_STATUS_OK)

			return 0;