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

BugLink: https://bugs.launchpad.net/bugs/1946024
[ 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: 20aedafdf492 ("ASoC: wcd9335: add support to wcd9335 codec")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Message-Id: <6dc12372f09fabb70bf05941dbe6a1382dc93e43.1629091028.git.christophe.jaillet@wanadoo.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c
index a31a20dcd6b53d93d2e44f4d482ac56d454ec17e..5ec63217ad0205730c3a705fdea7d1665e17b66e 100644 (file)
--- a/sound/soc/codecs/wcd9335.c
+++ b/sound/soc/codecs/wcd9335.c
@@ -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)