summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 16:32:25 +0100
committerMark Brown <broonie@linaro.org>2014-08-04 16:32:25 +0100
commitae34a78c430c37c06404f032fb04e51315204281 (patch)
tree904f425393ac99539827d3164d2b0f78ac1607c5 /sound/soc
parente99a866c4c6749eb3754e61d43eb18ef32e3556a (diff)
parent7eced3ec080d7868715f8af4628c36726ef913e7 (diff)
downloadblackbird-op-linux-ae34a78c430c37c06404f032fb04e51315204281.tar.gz
blackbird-op-linux-ae34a78c430c37c06404f032fb04e51315204281.zip
Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8985.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index b0f643458e0a..ee380190399f 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -980,9 +980,6 @@ static int wm8985_resume(struct snd_soc_codec *codec)
static int wm8985_remove(struct snd_soc_codec *codec)
{
- struct wm8985_priv *wm8985;
-
- wm8985 = snd_soc_codec_get_drvdata(codec);
wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
}
OpenPOWER on IntegriCloud