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

Commit 07495f3e authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Fix memory allocation for snd_soc_dapm_switch names 



snd_soc_dapm_switch ends up ends up in dapm_new_mixer() (since a switch
is a special case of a mixer with only one input) but this wasn't
correctly handled in the code.

Also fix the coding style for the switch below while we're here.

Reported-by: default avatarJoonyoung Shim <dofmind@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b0c5033f

sound/soc/soc-dapm.c

+3 −4
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int dapm_new_mixer(struct snd_soc_codec *codec, 
			 * kcontrol name.

			 */

			name_len = strlen(w->kcontrols[i].name) + 1;

			if (w->id == snd_soc_dapm_mixer)

			if (w->id != snd_soc_dapm_mixer_named_ctl)

				name_len += 1 + strlen(w->name);



			path->long_name = kmalloc(name_len, GFP_KERNEL);
@@ -341,7 +341,6 @@ static int dapm_new_mixer(struct snd_soc_codec *codec, 
				return -ENOMEM;



			switch (w->id) {

			case snd_soc_dapm_mixer:

			default:

				snprintf(path->long_name, name_len, "%s %s",

					 w->name, w->kcontrols[i].name);