Merge "Merge android-5.4.7 (861433ef) into msm-5.4"

This commit is contained in:
qctecmdr 2020-02-21 19:28:06 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3ffb183dd9
572 changed files with 69794 additions and 61780 deletions

View file

@ -923,7 +923,8 @@ static inline void cec_msg_give_deck_status(struct cec_msg *msg,
msg->len = 3;
msg->msg[1] = CEC_MSG_GIVE_DECK_STATUS;
msg->msg[2] = status_req;
msg->reply = reply ? CEC_MSG_DECK_STATUS : 0;
msg->reply = (reply && status_req != CEC_OP_STATUS_REQ_OFF) ?
CEC_MSG_DECK_STATUS : 0;
}
static inline void cec_ops_give_deck_status(const struct cec_msg *msg,
@ -1027,7 +1028,8 @@ static inline void cec_msg_give_tuner_device_status(struct cec_msg *msg,
msg->len = 3;
msg->msg[1] = CEC_MSG_GIVE_TUNER_DEVICE_STATUS;
msg->msg[2] = status_req;
msg->reply = reply ? CEC_MSG_TUNER_DEVICE_STATUS : 0;
msg->reply = (reply && status_req != CEC_OP_STATUS_REQ_OFF) ?
CEC_MSG_TUNER_DEVICE_STATUS : 0;
}
static inline void cec_ops_give_tuner_device_status(const struct cec_msg *msg,