summaryrefslogtreecommitdiff
path: root/drivers/media/cec/platform/s5p/s5p_cec.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-11-25 19:16:05 +0000
committerMark Brown <broonie@kernel.org>2022-11-25 19:16:05 +0000
commit5cd4d3886780bf9a846eada29a2aefe8bfcac027 (patch)
treeea5cc9b11657912a1371932ad467a7a622e8010c /drivers/media/cec/platform/s5p/s5p_cec.c
parentef3232e3dbd172fa17190fa8a852a3180a73bbdc (diff)
parentf0c4d9fc9cc9462659728d168387191387e903cc (diff)
Merge tag 'v6.1-rc4' into spi-6.2
Linux 6.1-rc4 which should get my CI working on RPi3s again.
Diffstat (limited to 'drivers/media/cec/platform/s5p/s5p_cec.c')
-rw-r--r--drivers/media/cec/platform/s5p/s5p_cec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/cec/platform/s5p/s5p_cec.c b/drivers/media/cec/platform/s5p/s5p_cec.c
index ce9a9d922f11..0a30e7acdc10 100644
--- a/drivers/media/cec/platform/s5p/s5p_cec.c
+++ b/drivers/media/cec/platform/s5p/s5p_cec.c
@@ -115,6 +115,8 @@ static irqreturn_t s5p_cec_irq_handler(int irq, void *priv)
dev_dbg(cec->dev, "Buffer overrun (worker did not process previous message)\n");
cec->rx = STATE_BUSY;
cec->msg.len = status >> 24;
+ if (cec->msg.len > CEC_MAX_MSG_SIZE)
+ cec->msg.len = CEC_MAX_MSG_SIZE;
cec->msg.rx_status = CEC_RX_STATUS_OK;
s5p_cec_get_rx_buf(cec, cec->msg.len,
cec->msg.msg);