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

Commit e6b486b5 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: smem: Fix uninitialized usage of a stack variable" into msm-4.9

parents f372f440 e219220c

drivers/soc/qcom/msm_smem.c

+2 −2
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static void *__smem_get_entry_secure(unsigned int id, 
	uint32_t a_hdr_size;

	int rc;



	SMEM_DBG("%s(%u, %u, %u, %u, %d, %d)\n", __func__, id, *size, to_proc,

	SMEM_DBG("%s(%u, %u, %u, %d, %d)\n", __func__, id, to_proc,

					flags, skip_init_check, use_rspinlock);



	if (!skip_init_check && !smem_initialized_check())
@@ -818,7 +818,7 @@ EXPORT_SYMBOL(smem_alloc); 
void *smem_get_entry(unsigned int id, unsigned int *size, unsigned int to_proc,

							unsigned int flags)

{

	SMEM_DBG("%s(%u, %u, %u, %u)\n", __func__, id, *size, to_proc, flags);

	SMEM_DBG("%s(%u, %u, %u)\n", __func__, id, to_proc, flags);



	/*

	 * Handle the circular dependecy between SMEM and software implemented