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

Commit aa342049 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: smem: Fix uninitialized usage of a stack variable"

parents 7e8a340d 4d6d9ed6

drivers/soc/qcom/smem.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2015,2017 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -367,7 +367,7 @@ static void *__smem_get_entry_secure(unsigned 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())
@@ -788,7 +788,7 @@ EXPORT_SYMBOL(smem_alloc); 
void *smem_get_entry(unsigned id, unsigned *size, unsigned to_proc,

								unsigned 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