[media] vivid: don't handle CEC_MSG_SET_STREAM_PATH
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 20 Jul 2016 08:59:42 +0000 (05:59 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Thu, 28 Jul 2016 23:15:23 +0000 (20:15 -0300)
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>
drivers/media/platform/vivid/vivid-cec.c

index 66aa729..f9f878b 100644 (file)
@@ -169,7 +169,6 @@ static int vivid_received(struct cec_adapter *adap, struct cec_msg *msg)
        struct vivid_dev *dev = adap->priv;
        struct cec_msg reply;
        u8 dest = cec_msg_destination(msg);
-       u16 pa;
        u8 disp_ctl;
        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));
 
        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:
                if (!cec_is_sink(adap))
                        return -ENOMSG;