Commit e76cbec8 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 63d171f8

drivers/media/cec/cec-adap.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

drivers/media/cec/cec-api.c

+0 −8
Original line number Diff line number Diff line
@@ -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