diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-18 23:13:58 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-18 23:13:58 -0500 |
| commit | 895be5b31e5175bef575008aadb4f0a27b850daa (patch) | |
| tree | 8dee294c18f3fa3ebbf6aa2d4d93d2212c8bba4d /sound | |
| parent | d05d7803405f18b0f923cc395676a10a2b5e7201 (diff) | |
| parent | 88b5bdfda886e9774b03f02ffe4295be124124f6 (diff) | |
Merge remote-tracking branch 'asoc/fix/wm8993' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8993.c | 1 |
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) | |||
| 1562 | struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); | 1562 | struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); |
| 1563 | 1563 | ||
| 1564 | wm8993_set_bias_level(codec, SND_SOC_BIAS_OFF); | 1564 | wm8993_set_bias_level(codec, SND_SOC_BIAS_OFF); |
| 1565 | regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies); | ||
| 1566 | return 0; | 1565 | return 0; |
| 1567 | } | 1566 | } |
| 1568 | 1567 | ||