media: cec: move check from cec_transmit to cec_transmit_msg_fh

This ensures all the cec_msg checks are done in the same place.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
index b6102510e2031b06a34da9f0b35bc7ae051b2949..5b9232b6e66351daf977a1e8ee0ea48eee8858e5 100644 (file)
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
@@ -761,6 +761,11 @@ int cec_transmit_msg_fh(struct cec_adapter *adap, struct cec_msg *msg,
                return -EINVAL;
        }
 
+       /* A CDC-Only device can only send CDC messages */
+       if ((adap->log_addrs.flags & CEC_LOG_ADDRS_FL_CDC_ONLY) &&
+           (msg->len == 1 || msg->msg[1] != CEC_MSG_CDC_MESSAGE))
+               return -EINVAL;
+
        if (msg->len >= 4 && msg->msg[1] == CEC_MSG_CDC_MESSAGE) {
                msg->msg[2] = adap->phys_addr >> 8;
                msg->msg[3] = adap->phys_addr & 0xff;

diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/cec-api.c
index 156a0d76ab2a1efe8d791c57dfcb76cfe0beb9ed..12d6764844724ccc0b85126e52a9882e189413cf 100644 (file)
--- a/drivers/media/cec/cec-api.c
+++ b/drivers/media/cec/cec-api.c
@@ -198,19 +198,11 @@ static long cec_transmit(struct cec_adapter *adap, struct cec_fh *fh,
        if (copy_from_user(&msg, parg, sizeof(msg)))
                return -EFAULT;
 
-       /* A CDC-Only device can only send CDC messages */
-       if ((adap->log_addrs.flags & CEC_LOG_ADDRS_FL_CDC_ONLY) &&
-           (msg.len == 1 || msg.msg[1] != CEC_MSG_CDC_MESSAGE))
-               return -EINVAL;
-
        mutex_lock(&adap->lock);
        if (adap->log_addrs.num_log_addrs == 0)
                err = -EPERM;
        else if (adap->is_configuring)
                err = -ENONET;
-       else if (!adap->is_configured &&
-                (adap->needs_hpd || msg.msg[0] != 0xf0))
-               err = -ENONET;
        else if (cec_is_busy(adap, fh))
                err = -EBUSY;
        else