diff options
| author | Hans Verkuil <hansverk@cisco.com> | 2016-12-09 11:14:32 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-12-21 06:59:57 -0200 |
| commit | 120476123646ba3619c90db7bcbc6f8eea53c990 (patch) | |
| tree | c19c2b0daa2fba384c7c987b501d7da3cdf76f87 | |
| parent | f3854973f196baad5be6b62d8f5ea24b0346b63f (diff) | |
| download | linux-120476123646ba3619c90db7bcbc6f8eea53c990.tar.gz linux-120476123646ba3619c90db7bcbc6f8eea53c990.tar.bz2 linux-120476123646ba3619c90db7bcbc6f8eea53c990.zip | |
[media] cec: when canceling a message, don't overwrite old status info
When a pending message was canceled (e.g. due to a timeout), then the
old tx_status info was overwritten instead of ORed. The same happened
with the tx_error_cnt field. So just modify them instead of overwriting
them.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | drivers/media/cec/cec-adap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c index f15f6ffd75b2..3191c0c5eae1 100644 --- a/drivers/media/cec/cec-adap.c +++ b/drivers/media/cec/cec-adap.c @@ -288,10 +288,10 @@ static void cec_data_cancel(struct cec_data *data) /* Mark it as an error */ data->msg.tx_ts = ktime_get_ns(); - data->msg.tx_status = CEC_TX_STATUS_ERROR | - CEC_TX_STATUS_MAX_RETRIES; + data->msg.tx_status |= CEC_TX_STATUS_ERROR | + CEC_TX_STATUS_MAX_RETRIES; + data->msg.tx_error_cnt++; data->attempts = 0; - data->msg.tx_error_cnt = 1; /* Queue transmitted message for monitoring purposes */ cec_queue_msg_monitor(data->adap, &data->msg, 1); |