summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:26 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-10 00:22:26 +0900
commit47f07b77f23224fd8414fe68cb937be410d4f946 (patch)
tree42ea32ae3015dd166d2f85d51209e8a60c46a598 /sound
parent719454d213f6e857b527e965eb6a1c8390cfc9b9 (diff)
parent5851e9b89d9a3dc38fbd68efac95fac7f7f85b5a (diff)
downloadlinux-47f07b77f23224fd8414fe68cb937be410d4f946.tar.bz2
Merge remote-tracking branch 'asoc/topic/wm8350' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8350.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c
index a4cae060bf26..32b8f0852f6e 100644
--- a/sound/soc/codecs/wm8350.c
+++ b/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;
}