提交 39ed20ef 编写于 作者: H Hans Verkuil 提交者: Yang Yingliang

media: cec: CEC 2.0-only bcast messages were ignored

commit cec935ce69fc386f13959578deb40963ebbb85c3 upstream.

Some messages are allowed to be a broadcast message in CEC 2.0
only, and should be ignored by CEC 1.4 devices.

Unfortunately, the check was wrong, causing such messages to be
marked as invalid under CEC 2.0.
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: <stable@vger.kernel.org>      # for v4.10 and up
Signed-off-by: NMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 4d6738dc
...@@ -1038,11 +1038,11 @@ void cec_received_msg_ts(struct cec_adapter *adap, ...@@ -1038,11 +1038,11 @@ void cec_received_msg_ts(struct cec_adapter *adap,
valid_la = false; valid_la = false;
else if (!cec_msg_is_broadcast(msg) && !(dir_fl & DIRECTED)) else if (!cec_msg_is_broadcast(msg) && !(dir_fl & DIRECTED))
valid_la = false; valid_la = false;
else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST1_4)) else if (cec_msg_is_broadcast(msg) && !(dir_fl & BCAST))
valid_la = false; valid_la = false;
else if (cec_msg_is_broadcast(msg) && else if (cec_msg_is_broadcast(msg) &&
adap->log_addrs.cec_version >= CEC_OP_CEC_VERSION_2_0 && adap->log_addrs.cec_version < CEC_OP_CEC_VERSION_2_0 &&
!(dir_fl & BCAST2_0)) !(dir_fl & BCAST1_4))
valid_la = false; valid_la = false;
} }
if (valid_la && min_len) { if (valid_la && min_len) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册