From 25821739b780980e0669915407dee4a4433712d7 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 10 Dec 2012 00:22:26 +0900
Subject: [PATCH] --- yaml --- r: 342944 b: refs/heads/master c:
 47f07b77f23224fd8414fe68cb937be410d4f946 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8350.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7047e9c601ed..7e44d523cb86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 719454d213f6e857b527e965eb6a1c8390cfc9b9
+refs/heads/master: 47f07b77f23224fd8414fe68cb937be410d4f946
diff --git a/trunk/sound/soc/codecs/wm8350.c b/trunk/sound/soc/codecs/wm8350.c
index a4cae060bf26..32b8f0852f6e 100644
--- a/trunk/sound/soc/codecs/wm8350.c
+++ b/trunk/sound/soc/codecs/wm8350.c
@@ -1500,7 +1500,7 @@ static  int wm8350_codec_probe(struct snd_soc_codec *codec)
 	for (i = 0; i < ARRAY_SIZE(supply_names); i++)
 		priv->supplies[i].supply = supply_names[i];
 
-	ret = regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies),
+	ret = devm_regulator_bulk_get(wm8350->dev, ARRAY_SIZE(priv->supplies),
 				 priv->supplies);
 	if (ret != 0)
 		return ret;
@@ -1607,8 +1607,6 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
 
 	wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA);
 
-	regulator_bulk_free(ARRAY_SIZE(priv->supplies), priv->supplies);
-
 	return 0;
 }