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

Commit 9ade62c2 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

cec: when canceling a message, don't overwrite old status info 




[ Upstream commit 120476123646ba3619c90db7bcbc6f8eea53c990 ]

When a pending message was canceled (e.g. due to a timeout), then the
old tx_status info was overwritten instead of ORed. The same happened
with the tx_error_cnt field. So just modify them instead of overwriting
them.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c5bac3d

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

+3 −3
Original line number Diff line number Diff line
@@ -288,10 +288,10 @@ static void cec_data_cancel(struct cec_data *data) 


	/* Mark it as an error */

	data->msg.tx_ts = ktime_get_ns();

	data->msg.tx_status = CEC_TX_STATUS_ERROR |

	data->msg.tx_status |= CEC_TX_STATUS_ERROR |

			       CEC_TX_STATUS_MAX_RETRIES;

	data->msg.tx_error_cnt++;

	data->attempts = 0;

	data->msg.tx_error_cnt = 1;

	/* Queue transmitted message for monitoring purposes */

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