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

This commit is contained in:
Linux Build Service Account 2017-01-03 17:56:53 -08:00 committed by Gerrit - the friendly Code Review server
commit 786f20f250

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2013-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
@ -375,7 +375,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())
@ -817,7 +817,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