summaryrefslogtreecommitdiffstats
path: root/drivers/media/cec
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2017-01-10 12:44:54 +0100
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-01-30 14:42:31 +0100
commitf9f96fc10c09ca16e336854c08bc1563eed97985 (patch)
tree0a9b6bf8e70129ebe08fa58b793fdd8eb3a30430 /drivers/media/cec
parent[media] cec-intro.rst: mention the v4l-utils package and CEC utilities (diff)
downloadlinux-f9f96fc10c09ca16e336854c08bc1563eed97985.tar.xz
linux-f9f96fc10c09ca16e336854c08bc1563eed97985.zip
[media] cec: fix wrong last_la determination
Due to an incorrect condition the last_la used for the initial attempt at claiming a logical address could be wrong. The last_la wasn't converted to a mask when ANDing with type2mask, so that test was broken. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/cec')
-rw-r--r--drivers/media/cec/cec-adap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/cec/cec-adap.c b/drivers/media/cec/cec-adap.c
index ebb5e391b800..87a6b65ed3af 100644
--- a/drivers/media/cec/cec-adap.c
+++ b/drivers/media/cec/cec-adap.c
@@ -1206,7 +1206,7 @@ static int cec_config_thread_func(void *arg)
las->log_addr[i] = CEC_LOG_ADDR_INVALID;
if (last_la == CEC_LOG_ADDR_INVALID ||
last_la == CEC_LOG_ADDR_UNREGISTERED ||
- !(last_la & type2mask[type]))
+ !((1 << last_la) & type2mask[type]))
last_la = la_list[0];
err = cec_config_log_addr(adap, i, last_la);