summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-19 05:13:58 +0100
committerMark Brown <broonie@linaro.org>2014-02-19 05:13:58 +0100
commit895be5b31e5175bef575008aadb4f0a27b850daa (patch)
tree8dee294c18f3fa3ebbf6aa2d4d93d2212c8bba4d /sound
parentMerge remote-tracking branches 'asoc/fix/blackfin', 'asoc/fix/da9055', 'asoc/... (diff)
parentASoC: wm8993: drop regulator_bulk_free of devm_ allocated data (diff)
downloadlinux-895be5b31e5175bef575008aadb4f0a27b850daa.tar.xz
linux-895be5b31e5175bef575008aadb4f0a27b850daa.zip
Merge remote-tracking branch 'asoc/fix/wm8993' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8993.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 433d59a0f3ef..2ee23a39622c 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -1562,7 +1562,6 @@ static int wm8993_remove(struct snd_soc_codec *codec)
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
wm8993_set_bias_level(codec, SND_SOC_BIAS_OFF);
- regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
return 0;
}