diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-04 11:32:25 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-04 11:32:25 -0400 |
| commit | ae34a78c430c37c06404f032fb04e51315204281 (patch) | |
| tree | 904f425393ac99539827d3164d2b0f78ac1607c5 /sound | |
| parent | e99a866c4c6749eb3754e61d43eb18ef32e3556a (diff) | |
| parent | 7eced3ec080d7868715f8af4628c36726ef913e7 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8985.c | 3 |
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) | |||
| 980 | 980 | ||
| 981 | static int wm8985_remove(struct snd_soc_codec *codec) | 981 | static int wm8985_remove(struct snd_soc_codec *codec) |
| 982 | { | 982 | { |
| 983 | struct wm8985_priv *wm8985; | ||
| 984 | |||
| 985 | wm8985 = snd_soc_codec_get_drvdata(codec); | ||
| 986 | wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF); | 983 | wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF); |
| 987 | return 0; | 984 | return 0; |
| 988 | } | 985 | } |