aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2019-05-29 04:22:15 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-05-29 10:38:11 -0400
commit64b42d8eee9b57d1329eeb338c3c30171a14cdbd (patch)
tree5bd2dfad6acf32e55fbe05dadb9222ad88937100
parentmedia: saa7164: fix remove_proc_entry warning (diff)
downloadlinux-dev-64b42d8eee9b57d1329eeb338c3c30171a14cdbd.tar.xz
linux-dev-64b42d8eee9b57d1329eeb338c3c30171a14cdbd.zip
media: cec-adap: fix regression in ping sanity check
Commit b6c96e156825 inadvertently also dropped the 'msg->len > 1' test from the preceding sanity check. This caused compliance test failures. Fixes: b6c96e156825 ("media: cec: allow any initiator for Ping and Image/Text View On") Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--drivers/media/cec/cec-adap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
index 5827d8c3742a..ac3683a7b2ab 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
@@ -809,7 +809,7 @@ int cec_transmit_msg_fh(struct cec_adapter *adap, struct cec_msg *msg,
__func__);
return -EINVAL;
}
- if (adap->is_configured &&
+ if (msg->len > 1 && adap->is_configured &&
!cec_has_log_addr(adap, cec_msg_initiator(msg))) {
dprintk(1, "%s: initiator has unknown logical address %d\n",
__func__, cec_msg_initiator(msg));