From: Nick Desaulniers <nick.desaulniers@gmail.com>
To: nick.desaulniers@gmail.com
Cc: Julia.Lawall@inria.fr, alsa-devel@alsa-project.org,
amadeuszx.slawinski@linux.intel.com,
andriy.shevchenko@linux.intel.com, broonie@kernel.org,
cezary.rojewski@intel.com, guennadi.liakhovetski@linux.intel.com,
liam.r.girdwood@linux.intel.com, linux-kernel@vger.kernel.org,
mateusz.gorski@linux.intel.com, perex@perex.cz,
pierre-louis.bossart@linux.intel.com, tiwai@suse.com,
yang.jie@linux.intel.com
Subject: [PATCH v2] ASoC: Intel: Skylake: skl-topology: fix -frame-larger-than
Date: Sun, 14 Mar 2021 00:06:13 -0800 [thread overview]
Message-ID: <20210314080613.190663-1-nick.desaulniers@gmail.com> (raw)
In-Reply-To: <20210314074434.164868-1-nick.desaulniers@gmail.com>
Fixes:
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.
Signed-off-by: Nick Desaulniers <nick.desaulniers@gmail.com>
---
Changes V1 -> V2: rebased on mainline.
sound/soc/intel/skylake/skl-topology.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c
index b824086203b9..566d07b4b523 100644
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
@@ -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)
{
struct snd_soc_dobj *dobj;
- struct snd_soc_acpi_mach *mach =
- dev_get_platdata(component->card->dev);
+ struct snd_soc_acpi_mach *mach;
+ struct snd_ctl_elem_value *val;
int i;
+ val = kzalloc(sizeof(*val), GFP_KERNEL);
+ if (!val)
+ return;
+
+ mach = dev_get_platdata(component->card->dev);
list_for_each_entry(dobj, &component->dobj_list, list) {
struct snd_kcontrol *kcontrol = dobj->control.kcontrol;
struct soc_enum *se;
@@ -3632,14 +3637,13 @@ static void skl_tplg_complete(struct snd_soc_component *component)
sprintf(chan_text, "c%d", mach->mach_params.dmic_num);
for (i = 0; i < se->items; i++) {
- struct snd_ctl_elem_value val = {};
-
if (strstr(texts[i], chan_text)) {
- val.value.enumerated.item[0] = i;
- 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 = {
base-commit: 88fe49249c99de14e543c632a46248d85411ab9e
--
2.25.1
next prev parent reply other threads:[~2021-03-14 8:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-14 7:44 [PATCH] ASoC: Intel: Skylake: skl-topology: fix -frame-larger-than Nick Desaulniers
2021-03-14 8:06 ` Nick Desaulniers [this message]
2021-03-14 10:48 ` [PATCH v2] " Andy Shevchenko
2021-03-15 1:39 ` [PATCH v3] " Nick Desaulniers
2021-03-18 13:52 ` Mark Brown
2021-03-18 18:33 ` Mark Brown
2021-03-18 18:36 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210314080613.190663-1-nick.desaulniers@gmail.com \
--to=nick.desaulniers@gmail.com \
--cc=Julia.Lawall@inria.fr \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=guennadi.liakhovetski@linux.intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mateusz.gorski@linux.intel.com \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
--cc=yang.jie@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).