Commit f635fd7d authored Dec 09, 2016 by Hans Verkuil Committed by Greg Kroah-Hartman Nov 30, 2017

cec: CEC_MSG_GIVE_FEATURES should abort for CEC version < 2




[ Upstream commit a24f56d47930492c94ef6875bf45adf7607ca1a4 ]

This is a 2.0 only message, so it should return Feature Abort if the
adapter is configured for CEC version 1.4.

Right now it does nothing, which means that the sender will time out.

Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 9ade62c2

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -1557,9 +1557,9 @@ static int cec_receive_notify(struct cec_adapter adap, struct cec_msg msg,
		}

		case CEC_MSG_GIVE_FEATURES:
		if (adap->log_addrs.cec_version >= CEC_OP_CEC_VERSION_2_0)
		if (adap->log_addrs.cec_version < CEC_OP_CEC_VERSION_2_0)
		return cec_feature_abort(adap, msg);
		return cec_report_features(adap, la_idx);
		return 0;

		default:
		/*