diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:08:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 03:08:51 -0400 |
commit | b9a3acf46afdafc601947136f63e9dd228cd86e8 (patch) | |
tree | 2b206b6d3c51f673c94fbcdf03df2a699e7110d2 /sound/soc/codecs/wm8903.c | |
parent | 9f0fa7991af382bfa8c9575d2457a0b6ad03ac4c (diff) | |
parent | 21d41f2b312231536cf981c960c83cc4493c0293 (diff) |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
-rw-r--r-- | sound/soc/codecs/wm8903.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 43e3d760766f..4ad8ebd290e3 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -2046,8 +2046,13 @@ static int wm8903_probe(struct snd_soc_codec *codec) | |||
2046 | /* power down chip */ | 2046 | /* power down chip */ |
2047 | static int wm8903_remove(struct snd_soc_codec *codec) | 2047 | static int wm8903_remove(struct snd_soc_codec *codec) |
2048 | { | 2048 | { |
2049 | struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec); | ||
2050 | |||
2049 | wm8903_free_gpio(codec); | 2051 | wm8903_free_gpio(codec); |
2050 | wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF); | 2052 | wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF); |
2053 | if (wm8903->irq) | ||
2054 | free_irq(wm8903->irq, codec); | ||
2055 | |||
2051 | return 0; | 2056 | return 0; |
2052 | } | 2057 | } |
2053 | 2058 | ||