Commit bef2897d authored by Nick Desaulniers's avatar Nick Desaulniers Committed by Mark Brown

ASoC: Intel: Skylake: skl-topology: fix -frame-larger-than

sound/soc/intel/skylake/skl-topology.c:3613:13: warning: stack frame
size of 1304 bytes in function 'skl_tplg_complete'
[-Wframe-larger-than=]

struct snd_ctl_elem_value is 1224 bytes in my configuration.

Heap allocate it, then free it within the current frame.
Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarNick Desaulniers <nick.desaulniers@gmail.com>
Link: https://lore.kernel.org/r/20210315013908.217219-1-nick.desaulniers@gmail.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent c00f4f25
...@@ -3613,10 +3613,15 @@ static int skl_manifest_load(struct snd_soc_component *cmpnt, int index, ...@@ -3613,10 +3613,15 @@ static int skl_manifest_load(struct snd_soc_component *cmpnt, int index,
static void skl_tplg_complete(struct snd_soc_component *component) static void skl_tplg_complete(struct snd_soc_component *component)
{ {
struct snd_soc_dobj *dobj; struct snd_soc_dobj *dobj;
struct snd_soc_acpi_mach *mach = struct snd_soc_acpi_mach *mach;
dev_get_platdata(component->card->dev); struct snd_ctl_elem_value *val;
int i; int i;
val = kmalloc(sizeof(*val), GFP_KERNEL);
if (!val)
return;
mach = dev_get_platdata(component->card->dev);
list_for_each_entry(dobj, &component->dobj_list, list) { list_for_each_entry(dobj, &component->dobj_list, list) {
struct snd_kcontrol *kcontrol = dobj->control.kcontrol; struct snd_kcontrol *kcontrol = dobj->control.kcontrol;
struct soc_enum *se; struct soc_enum *se;
...@@ -3632,14 +3637,14 @@ static void skl_tplg_complete(struct snd_soc_component *component) ...@@ -3632,14 +3637,14 @@ static void skl_tplg_complete(struct snd_soc_component *component)
sprintf(chan_text, "c%d", mach->mach_params.dmic_num); sprintf(chan_text, "c%d", mach->mach_params.dmic_num);
for (i = 0; i < se->items; i++) { for (i = 0; i < se->items; i++) {
struct snd_ctl_elem_value val = {};
if (strstr(texts[i], chan_text)) { if (strstr(texts[i], chan_text)) {
val.value.enumerated.item[0] = i; memset(val, 0, sizeof(*val));
kcontrol->put(kcontrol, &val); val->value.enumerated.item[0] = i;
kcontrol->put(kcontrol, val);
} }
} }
} }
kfree(val);
} }
static struct snd_soc_tplg_ops skl_tplg_ops = { static struct snd_soc_tplg_ops skl_tplg_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment