Commit 9ea7a991 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Mark Brown

ASoC: cs47l92: Simplify error handling code in 'cs47l92_probe()'

If 'madera_init_bus_error_irq()' fails,
'wm_adsp2_remove(&cs47l92->core.adsp[0])' will be called twice.
Once in the 'if' block, and once in the error handling path.
This is harmless, but one of this call can be axed.
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20191226162907.9490-1-christophe.jaillet@wanadoo.frSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5def0136
...@@ -1959,10 +1959,8 @@ static int cs47l92_probe(struct platform_device *pdev) ...@@ -1959,10 +1959,8 @@ static int cs47l92_probe(struct platform_device *pdev)
goto error_dsp_irq; goto error_dsp_irq;
ret = madera_init_bus_error_irq(&cs47l92->core, 0, wm_adsp2_bus_error); ret = madera_init_bus_error_irq(&cs47l92->core, 0, wm_adsp2_bus_error);
if (ret != 0) { if (ret != 0)
wm_adsp2_remove(&cs47l92->core.adsp[0]);
goto error_adsp; goto error_adsp;
}
madera_init_fll(madera, 1, MADERA_FLL1_CONTROL_1 - 1, madera_init_fll(madera, 1, MADERA_FLL1_CONTROL_1 - 1,
&cs47l92->fll[0]); &cs47l92->fll[0]);
......
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