summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2023-04-24 16:07:28 +0100
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-05-26 10:52:22 +0100
commit73af6c7511038249cad3d5f3b44bf8d78ac0f499 (patch)
tree494dda03233dfc47f507324b1cc0a1b814699792 /drivers
parentfe4526d99e2e06b08bb80316c3a596ea6a807b75 (diff)
downloadlinux-stable-73af6c7511038249cad3d5f3b44bf8d78ac0f499.tar.gz
linux-stable-73af6c7511038249cad3d5f3b44bf8d78ac0f499.tar.bz2
linux-stable-73af6c7511038249cad3d5f3b44bf8d78ac0f499.zip
media: cec: core: don't set last_initiator if tx in progress
When a message was received the last_initiator is set to 0xff. This will force the signal free time for the next transmit to that for a new initiator. However, if a new transmit is already in progress, then don't set last_initiator, since that's the initiator of the current transmit. Overwriting this would cause the signal free time of a following transmit to be that of the new initiator instead of a next transmit. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/cec/core/cec-adap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c
index be0c38969479..241b1621b197 100644
--- a/drivers/media/cec/core/cec-adap.c
+++ b/drivers/media/cec/core/cec-adap.c
@@ -1091,7 +1091,8 @@ void cec_received_msg_ts(struct cec_adapter *adap,
mutex_lock(&adap->lock);
dprintk(2, "%s: %*ph\n", __func__, msg->len, msg->msg);
- adap->last_initiator = 0xff;
+ if (!adap->transmit_in_progress)
+ adap->last_initiator = 0xff;
/* Check if this message was for us (directed or broadcast). */
if (!cec_msg_is_broadcast(msg)) {