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: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index b47280fa3b874edb6ed15d02ea7692dde7d17fad..004121e3582a98c652a893f2a4063df8a662f309 100644 (file)
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -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;