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

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

media: cec: fix wrong tx/rx_status values when canceling a msg 



When a message was canceled it could return tx_status with
both OK and MAX_RETRIES set, which is illegal.

If a canceled message was waiting for a reply, then rx_status
wasn't updated, so set that as well.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4ba610c8

drivers/media/cec/cec-adap.c

+13 −6
Original line number Diff line number Diff line
@@ -339,12 +339,19 @@ static void cec_data_cancel(struct cec_data *data) 
			data->adap->transmit_queue_sz--;

	}



	/* Mark it as an error */

	if (data->msg.tx_status & CEC_TX_STATUS_OK) {

		/* Mark the canceled RX as a timeout */

		data->msg.rx_ts = ktime_get_ns();

		data->msg.rx_status = CEC_RX_STATUS_TIMEOUT;

	} else {

		/* Mark the canceled TX as an error */

		data->msg.tx_ts = ktime_get_ns();

		data->msg.tx_status |= CEC_TX_STATUS_ERROR |

				       CEC_TX_STATUS_MAX_RETRIES;

		data->msg.tx_error_cnt++;

		data->attempts = 0;

	}



	/* Queue transmitted message for monitoring purposes */

	cec_queue_msg_monitor(data->adap, &data->msg, 1);