Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fdc9df authored by Johan Fjeldtvedt's avatar Johan Fjeldtvedt Committed by Mauro Carvalho Chehab
Browse files

[media] cec: allow configuration both from within driver and from user space 



It makes sense for adapters such as the Pulse-Eight to be configurable
both from within the driver and from user space, so remove the
requirement that drivers only can call cec_s_log_addrs or
cec_s_phys_addr if they don't expose those capabilities to user space.

Signed-off-by: default avatarJohan Fjeldtvedt <jaffe1@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent ae549135

drivers/staging/media/cec/cec-adap.c

+0 −4
Original line number Diff line number Diff line
@@ -1153,8 +1153,6 @@ void cec_s_phys_addr(struct cec_adapter *adap, u16 phys_addr, bool block) 
	if (IS_ERR_OR_NULL(adap))

		return;



	if (WARN_ON(adap->capabilities & CEC_CAP_PHYS_ADDR))

		return;

	mutex_lock(&adap->lock);

	__cec_s_phys_addr(adap, phys_addr, block);

	mutex_unlock(&adap->lock);
@@ -1295,8 +1293,6 @@ int cec_s_log_addrs(struct cec_adapter *adap, 
{

	int err;



	if (WARN_ON(adap->capabilities & CEC_CAP_LOG_ADDRS))

		return -EINVAL;

	mutex_lock(&adap->lock);

	err = __cec_s_log_addrs(adap, log_addrs, block);

	mutex_unlock(&adap->lock);