summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-07-14 19:06:07 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-14 20:12:31 +0100
commitcecb66fddf2a3deb44da1f741b6734a785df7957 (patch)
tree63d7cca82c4f19a41205c08f643ff7ed60a56964 /sound
parentc555b028f12e92c1de9cf5de0ef5886779590222 (diff)
downloadlinux-stable-cecb66fddf2a3deb44da1f741b6734a785df7957.tar.gz
linux-stable-cecb66fddf2a3deb44da1f741b6734a785df7957.tar.bz2
linux-stable-cecb66fddf2a3deb44da1f741b6734a785df7957.zip
ASoC:: remove a redundant snd_soc_unregister_codec call in wm8988_register
snd_soc_unregister_codec is called twice if snd_soc_register_dai fail. Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8988.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c
index 0417dae32e6f..19ad590ca0b3 100644
--- a/sound/soc/codecs/wm8988.c
+++ b/sound/soc/codecs/wm8988.c
@@ -885,7 +885,6 @@ static int wm8988_register(struct wm8988_priv *wm8988,
ret = snd_soc_register_dai(&wm8988_dai);
if (ret != 0) {
dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
- snd_soc_unregister_codec(codec);
goto err_codec;
}