Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9f96fc1 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 8015d6b8

drivers/media/cec/cec-adap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1206,7 +1206,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);