ASoC: wm8350: Handle error for wm8350_register_irq

BugLink: https://bugs.launchpad.net/bugs/1971497
[ Upstream commit db0350da8084ad549bca16cc0486c11cc70a1f9b ]

As the potential failure of the wm8350_register_irq(),
it should be better to check it and return error if fails.
Also, use 'free_' in order to avoid the same code.

Fixes: a6ba2b2dabb5 ("ASoC: Implement WM8350 headphone jack detection")
Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220304023821.391936-1-jiasheng@iscas.ac.cn
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: Stefan Bader <stefan.bader@canonical.com>

diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index fe99584c917f8bb0825b530a8da8408edc1ae13d..9cd91bb0a90225414db231c27d18b9db1eec7934 100644 (file)
--- a/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@ -1535,18 +1535,38 @@ static  int wm8350_component_probe(struct snd_soc_component *component)
        wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,
                          WM8350_JDL_ENA | WM8350_JDR_ENA);
 
-       wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L,
+       ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L,
                            wm8350_hpl_jack_handler, 0, "Left jack detect",
                            priv);
-       wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R,
+       if (ret != 0)
+               goto err;
+
+       ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R,
                            wm8350_hpr_jack_handler, 0, "Right jack detect",
                            priv);
-       wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICSCD,
+       if (ret != 0)
+               goto free_jck_det_l;
+
+       ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICSCD,
                            wm8350_mic_handler, 0, "Microphone short", priv);
-       wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD,
+       if (ret != 0)
+               goto free_jck_det_r;
+
+       ret = wm8350_register_irq(wm8350, WM8350_IRQ_CODEC_MICD,
                            wm8350_mic_handler, 0, "Microphone detect", priv);
+       if (ret != 0)
+               goto free_micscd;
 
        return 0;
+
+free_micscd:
+       wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_MICSCD, priv);
+free_jck_det_r:
+       wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R, priv);
+free_jck_det_l:
+       wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L, priv);
+err:
+       return ret;
 }
 
 static void wm8350_component_remove(struct snd_soc_component *component)