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

Commit fa6e02c6 authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman
Browse files

cec: update log_addr[] before finishing configuration 




[ Upstream commit 7af26f889eb67db272021a939f7d4a57e96dd961 ]

The loop that sets the unused logical addresses to INVALID should be
done before 'configured' is set to true. This ensures that cec_log_addrs
is consistent before it will be used.

Signed-off-by: default avatarHans Verkuil <hansverk@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 f635fd7d

drivers/staging/media/cec/cec-adap.c

+2 −2
Original line number Diff line number Diff line
@@ -1062,6 +1062,8 @@ static int cec_config_thread_func(void *arg) 
		for (i = 1; i < las->num_log_addrs; i++)

			las->log_addr[i] = CEC_LOG_ADDR_INVALID;

	}

	for (i = las->num_log_addrs; i < CEC_MAX_LOG_ADDRS; i++)

		las->log_addr[i] = CEC_LOG_ADDR_INVALID;

	adap->is_configured = true;

	adap->is_configuring = false;

	cec_post_state_event(adap);
@@ -1079,8 +1081,6 @@ static int cec_config_thread_func(void *arg) 
			cec_report_features(adap, i);

		cec_report_phys_addr(adap, i);

	}

	for (i = las->num_log_addrs; i < CEC_MAX_LOG_ADDRS; i++)

		las->log_addr[i] = CEC_LOG_ADDR_INVALID;

	mutex_lock(&adap->lock);

	adap->kthread_config = NULL;

	mutex_unlock(&adap->lock);