shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: [media] cec: CEC_MSG_GIVE_FEATURES should abort for CEC version < 2

Browse Source 
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>
(cherry picked from commit a24f56d479)

Change-Id: Ibd812b99013bf83a080c0c89219b8fef4396cd88
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
This commit is contained in:
Hans Verkuil
2016-12-09 11:28:19 -02:00
committed by Tao Huang
parent b94321dc68
commit 3939b39580
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/cec/cec-adap.c
View File

@@ -1777,9 +1777,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)
return cec_report_features(adap, la_idx);
return 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);
default:
/*