ASoC: arizona: Fix error path in codec probe
Subsystems (3)
PATCH 1/1 ASoC: arizona: Fix error path in codec probe
If we fail to add some DSPs or fail to add the controls we should call wm_adsp2_codec_remove for all the cores we have already added. This patch fixes this up on the wm5102 and wm5110.
--- sound/soc/codecs/wm5102.c | 7 ++++++- sound/soc/codecs/wm5110.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-)
sound/soc/codecs/wm5102.c +6 -1
@@ -1879,7 +1879,7 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) ret =snd_soc_add_codec_controls (codec, arizona_adsp2_rate_controls,1 );if (ret) -return ret; + goto err_adsp2_codec_probe;arizona_init_spk (codec);arizona_init_gpio (codec);
@@ -1889,6 +1889,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) priv->core.arizona->dapm = dapm;return 0 ; + +err_adsp2_codec_probe: +wm_adsp2_codec_remove (&priv->core.adsp[0 ], codec); + +return ret; }static int wm5102_codec_remove (struct snd_soc_codec *codec)
sound/soc/codecs/wm5110.c +8 -2
@@ -1874,18 +1874,24 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)for (i =0 ; i <WM5110_NUM_ADSP ; ++i) { ret =wm_adsp2_codec_probe (&priv->core.adsp[i], codec);if (ret) -return ret; + goto err_adsp2_codec_probe; } ret =snd_soc_add_codec_controls (codec, arizona_adsp2_rate_controls,WM5110_NUM_ADSP );if (ret) -return ret; + goto err_adsp2_codec_probe;snd_soc_dapm_disable_pin (dapm,"HAPTICS" );return 0 ; + +err_adsp2_codec_probe: +for (--i; i >=0 ; --i) +wm_adsp2_codec_remove (&priv->core.adsp[i], codec); + +return ret; }static int wm5110_codec_remove (struct snd_soc_codec *codec)
Signature · 1 line
1.7.2.5
Mark Brown
maintainerApplied "ASoC: arizona: Fix error path in codec probe" to the asoc tree
The patch
ASoC: arizona: Fix error path in codec probe
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
d90c6cc242045115c5c4973114cc93e1c20e2ea8Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Fri, 10 Jul 2015 14:37:25 +0100
Subject: [PATCH] ASoC: arizona: Fix error path in codec probe
If we fail to add some DSPs or fail to add the controls we should call wm_adsp2_codec_remove for all the cores we have already added. This patch fixes this up on the wm5102 and wm5110.
--- sound/soc/codecs/wm5102.c | 7 ++++++- sound/soc/codecs/wm5110.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-)
sound/soc/codecs/wm5102.c +6 -1
@@ -1879,7 +1879,7 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) ret =snd_soc_add_codec_controls (codec, arizona_adsp2_rate_controls,1 );if (ret) -return ret; + goto err_adsp2_codec_probe;arizona_init_spk (codec);arizona_init_gpio (codec);
@@ -1889,6 +1889,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) priv->core.arizona->dapm = dapm;return 0 ; + +err_adsp2_codec_probe: +wm_adsp2_codec_remove (&priv->core.adsp[0 ], codec); + +return ret; }static int wm5102_codec_remove (struct snd_soc_codec *codec)
sound/soc/codecs/wm5110.c +8 -2
@@ -1607,18 +1607,24 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)for (i =0 ; i <WM5110_NUM_ADSP ; ++i) { ret =wm_adsp2_codec_probe (&priv->core.adsp[i], codec);if (ret) -return ret; + goto err_adsp2_codec_probe; } ret =snd_soc_add_codec_controls (codec, arizona_adsp2_rate_controls,WM5110_NUM_ADSP );if (ret) -return ret; + goto err_adsp2_codec_probe;snd_soc_dapm_disable_pin (dapm,"HAPTICS" );return 0 ; + +err_adsp2_codec_probe: +for (--i; i >=0 ; --i) +wm_adsp2_codec_remove (&priv->core.adsp[i], codec); + +return ret; }static int wm5110_codec_remove (struct snd_soc_codec *codec)
Signature · 1 line
2.1.4