aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-04-18 11:26:19 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2018-04-20 08:37:35 -0400
commit0fd6e1217303c98550de3552c65837c3f56729da (patch)
treef58beeb7f8f81fcb591c77986539665b23032d9a
parentmedia: cx231xx: Add support for AverMedia DVD EZMaker 7 (diff)
downloadlinux-dev-0fd6e1217303c98550de3552c65837c3f56729da.tar.xz
linux-dev-0fd6e1217303c98550de3552c65837c3f56729da.zip
media: cec: set ev rather than v with CEC_PIN_EVENT_FL_DROPPED bit
Setting v with the CEC_PIN_EVENT_FL_DROPPED is incorrect, instead ev should be set with this bit. Fix this. Detected by CoverityScan, CID#1467974 ("Extra high-order bits") Fixes: 6ec1cbf6b125 ("media: cec: improve CEC pin event handling") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Hans Verkuil <hansverk@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/cec/cec-pin.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/cec/cec-pin.c b/drivers/media/cec/cec-pin.c
index 2a5df99735fa..6e311424f0dc 100644
--- a/drivers/media/cec/cec-pin.c
+++ b/drivers/media/cec/cec-pin.c
@@ -119,7 +119,7 @@ static void cec_pin_update(struct cec_pin *pin, bool v, bool force)
if (pin->work_pin_events_dropped) {
pin->work_pin_events_dropped = false;
- v |= CEC_PIN_EVENT_FL_DROPPED;
+ ev |= CEC_PIN_EVENT_FL_DROPPED;
}
pin->work_pin_events[pin->work_pin_events_wr] = ev;
pin->work_pin_ts[pin->work_pin_events_wr] = ktime_get();