diff options
| author | Hans Verkuil <hansverk@cisco.com> | 2016-12-09 11:14:32 -0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-30 08:39:14 +0000 |
| commit | 9ade62c27d3d9ac38b2dc1e496db377fd8298d92 (patch) | |
| tree | 18c4a5a9973be0b7e1e4d422c7fb05ef6968a771 | |
| parent | 6c5bac3d6c83fbaaeeb7ca9c4ba84ac3a7ef64f1 (diff) | |
| download | linux-9ade62c27d3d9ac38b2dc1e496db377fd8298d92.tar.gz linux-9ade62c27d3d9ac38b2dc1e496db377fd8298d92.tar.bz2 linux-9ade62c27d3d9ac38b2dc1e496db377fd8298d92.zip | |
cec: when canceling a message, don't overwrite old status info
[ Upstream commit 120476123646ba3619c90db7bcbc6f8eea53c990 ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/media/cec/cec-adap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/cec/cec-adap.c b/drivers/staging/media/cec/cec-adap.c index 057c9b5ab1e5..d1f186745ff9 100644 --- a/drivers/staging/media/cec/cec-adap.c +++ b/drivers/staging/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); |