Commit d934fe02 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman

cec: fix wrong last_la determination


[ Upstream commit f9f96fc1 ]

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62614714
...@@ -1017,7 +1017,7 @@ static int cec_config_thread_func(void *arg) ...@@ -1017,7 +1017,7 @@ static int cec_config_thread_func(void *arg)
las->log_addr[i] = CEC_LOG_ADDR_INVALID; las->log_addr[i] = CEC_LOG_ADDR_INVALID;
if (last_la == CEC_LOG_ADDR_INVALID || if (last_la == CEC_LOG_ADDR_INVALID ||
last_la == CEC_LOG_ADDR_UNREGISTERED || last_la == CEC_LOG_ADDR_UNREGISTERED ||
!(last_la & type2mask[type])) !((1 << last_la) & type2mask[type]))
last_la = la_list[0]; last_la = la_list[0];
err = cec_config_log_addr(adap, i, last_la); err = cec_config_log_addr(adap, i, last_la);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment