openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] vivid: don't handle CEC_MSG_SET_STREAM_PATH 

vivid shouldn't process the CEC_MSG_SET_STREAM_PATH message: this will confuse
userspace follower code because it isn't aware of the state change of becoming
an active source.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Hans Verkuil 2016-07-20 05:59:42 -03:00 committed by Mauro Carvalho Chehab
parent 52e37f0a66
commit 5bbea66bf8
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/platform/vivid/vivid-cec.c
View File

@ -169,7 +169,6 @@ static int vivid_received(struct cec_adapter *adap, struct cec_msg *msg)
struct vivid_dev *dev = adap->priv; struct vivid_dev *dev = adap->priv;
struct cec_msg reply; struct cec_msg reply;
u8 dest = cec_msg_destination(msg); u8 dest = cec_msg_destination(msg);
u16 pa;
u8 disp_ctl; u8 disp_ctl;
char osd[14]; char osd[14];
@ -178,15 +177,6 @@ static int vivid_received(struct cec_adapter *adap, struct cec_msg *msg)
cec_msg_init(&reply, dest, cec_msg_initiator(msg)); cec_msg_init(&reply, dest, cec_msg_initiator(msg));
switch (cec_msg_opcode(msg)) { switch (cec_msg_opcode(msg)) {
case CEC_MSG_SET_STREAM_PATH:
if (cec_is_sink(adap))
return -ENOMSG;
cec_ops_set_stream_path(msg, &pa);
if (pa != adap->phys_addr)
return -ENOMSG;
cec_msg_active_source(&reply, adap->phys_addr);
cec_transmit_msg(adap, &reply, false);
break;
case CEC_MSG_SET_OSD_STRING: case CEC_MSG_SET_OSD_STRING:
if (!cec_is_sink(adap)) if (!cec_is_sink(adap))
return -ENOMSG; return -ENOMSG;