]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: cec-adap: fix regression in ping sanity check
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 29 May 2019 08:22:15 +0000 (04:22 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Wed, 29 May 2019 14:38:11 +0000 (10:38 -0400)
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>
drivers/media/cec/cec-adap.c

index 5827d8c3742a86411973aba0be7cab695d71e1fe..ac3683a7b2abec32ebafada5e21d7a1bc9753b2e 100644 (file)
@@ -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));