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

Commit f3ec07f8 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

ASoC: wcd9335: Fix a memory leak in the error handling path of the probe function 



[ Upstream commit fc6fc81caa63900cef9ebb8b2e365c3ed5a9effb ]

If 'wcd9335_setup_irqs()' fails, me must release the memory allocated in
'wcd_clsh_ctrl_alloc()', as already done in the remove function.

Add an error handling path and the missing 'wcd_clsh_ctrl_free()' call.

Fixes: 20aedafd ("ASoC: wcd9335: add support to wcd9335 codec")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Message-Id: <6dc12372f09fabb70bf05941dbe6a1382dc93e43.1629091028.git.christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a6088f4e

sound/soc/codecs/wcd9335.c

+10 −1
Original line number Diff line number Diff line
@@ -4844,6 +4844,7 @@ static void wcd9335_codec_init(struct snd_soc_component *component) 
static int wcd9335_codec_probe(struct snd_soc_component *component)

{

	struct wcd9335_codec *wcd = dev_get_drvdata(component->dev);

	int ret;

	int i;



	snd_soc_component_init_regmap(component, wcd->regmap);
@@ -4861,7 +4862,15 @@ static int wcd9335_codec_probe(struct snd_soc_component *component) 
	for (i = 0; i < NUM_CODEC_DAIS; i++)

		INIT_LIST_HEAD(&wcd->dai[i].slim_ch_list);



	return wcd9335_setup_irqs(wcd);

	ret = wcd9335_setup_irqs(wcd);

	if (ret)

		goto free_clsh_ctrl;



	return 0;



free_clsh_ctrl:

	wcd_clsh_ctrl_free(wcd->clsh_ctrl);

	return ret;

}



static void wcd9335_codec_remove(struct snd_soc_component *comp)