cec: when canceling a message, don't overwrite old status info
authorHans Verkuil <hansverk@cisco.com>
Fri, 9 Dec 2016 13:14:32 +0000 (11:14 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 08:39:14 +0000 (08:39 +0000)
commit9ade62c27d3d9ac38b2dc1e496db377fd8298d92
tree18c4a5a9973be0b7e1e4d422c7fb05ef6968a771
parent6c5bac3d6c83fbaaeeb7ca9c4ba84ac3a7ef64f1
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>
drivers/staging/media/cec/cec-adap.c