Commit db0350da authored by Jiasheng Jiang's avatar Jiasheng Jiang Committed by Mark Brown

ASoC: wm8350: Handle error for wm8350_register_irq

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: a6ba2b2d ("ASoC: Implement WM8350 headphone jack detection")
Signed-off-by: default avatarJiasheng Jiang <jiasheng@iscas.ac.cn>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220304023821.391936-1-jiasheng@iscas.ac.cnSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent f590797f
...@@ -1537,18 +1537,38 @@ static int wm8350_component_probe(struct snd_soc_component *component) ...@@ -1537,18 +1537,38 @@ static int wm8350_component_probe(struct snd_soc_component *component)
wm8350_clear_bits(wm8350, WM8350_JACK_DETECT, wm8350_clear_bits(wm8350, WM8350_JACK_DETECT,
WM8350_JDL_ENA | WM8350_JDR_ENA); 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", wm8350_hpl_jack_handler, 0, "Left jack detect",
priv); 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", wm8350_hpr_jack_handler, 0, "Right jack detect",
priv); 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_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); wm8350_mic_handler, 0, "Microphone detect", priv);
if (ret != 0)
goto free_micscd;
return 0; 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) static void wm8350_component_remove(struct snd_soc_component *component)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment