From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 30 Sep 2011 03:54:44 +0000 (+0800)
Subject: ASoC: Add missed regulator_unregister_notifier and regulator_bulk_free in wm8995_remove
X-Git-Tag: v3.2-rc1~38^2~5^2~215
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=5992c58781a38e193caf2fb6a5f4808d84af8591;p=linux-2.6-block.git

ASoC: Add missed regulator_unregister_notifier and regulator_bulk_free in wm8995_remove

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index 74ae5995a786..e05ee7969113 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -1573,9 +1573,16 @@ static int wm8995_resume(struct snd_soc_codec *codec)
 static int wm8995_remove(struct snd_soc_codec *codec)
 {
 	struct wm8995_priv *wm8995;
+	int i;
 
 	wm8995 = snd_soc_codec_get_drvdata(codec);
 	wm8995_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+	for (i = 0; i < ARRAY_SIZE(wm8995->supplies); ++i)
+		regulator_unregister_notifier(wm8995->supplies[i].consumer,
+					      &wm8995->disable_nb[i]);
+
+	regulator_bulk_free(ARRAY_SIZE(wm8995->supplies), wm8995->supplies);
 	return 0;
 }