diff options
| author | Joel Stanley <joel@jms.id.au> | 2020-01-02 05:09:07 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2020-01-02 05:09:11 +0300 |
| commit | eb27d232ba717f65312ed660b672feffa83f32ca (patch) | |
| tree | 473639a679273a21d3a782c1f2415e5524584b30 /include/uapi | |
| parent | 6d96543a7ed844fd3923ad30c93db48d3f7f00d0 (diff) | |
| parent | 122179cb7d648a6f36b20dd6bf34f953cb384c30 (diff) | |
| download | linux-eb27d232ba717f65312ed660b672feffa83f32ca.tar.xz | |
Merge tag 'v5.4.7' into dev-5.4
This is the 5.4.7 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/cec-funcs.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/cec-funcs.h b/include/uapi/linux/cec-funcs.h index 8997d5068c08..4511b85c84df 100644 --- a/include/uapi/linux/cec-funcs.h +++ b/include/uapi/linux/cec-funcs.h @@ -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, |