From ce725a03387d244468c93c04875925f758b370e1 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 30 Sep 2011 11:54:44 +0800
Subject: [PATCH] --- yaml --- r: 270711 b: refs/heads/master c:
 5992c58781a38e193caf2fb6a5f4808d84af8591 h: refs/heads/master i:   270709:
 8c61f8714b49be006661db5a8ef15a3611c0bedb   270707:
 ce3ac40a4a4adde9283a386d59b691f2009919fe   270703:
 271ea358644796adae02950d61c817121db8484f v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8995.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a22cf04a4382..0049d9b3e71b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6423aa9154e247752e8894ad686959d39be659f9
+refs/heads/master: 5992c58781a38e193caf2fb6a5f4808d84af8591
diff --git a/trunk/sound/soc/codecs/wm8995.c b/trunk/sound/soc/codecs/wm8995.c
index 74ae5995a786..e05ee7969113 100644
--- a/trunk/sound/soc/codecs/wm8995.c
+++ b/trunk/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;
 }