diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 09:30:41 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-23 09:30:41 -0500 |
| commit | d50a87402e29e16a63152be810d9723ce4d87e37 (patch) | |
| tree | 968932ec54cffd983b46bfb43d571c4d0d355561 /sound/soc/codecs/wm8904.c | |
| parent | 5033f43c66754296dfb0ac5c895208e4a7f93aac (diff) | |
| parent | 24fb2b1174ddc1f844e2008eb5b3105832860395 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index da9192890187..d0024666eaf9 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c | |||
| @@ -2498,6 +2498,8 @@ static int wm8904_remove(struct snd_soc_codec *codec) | |||
| 2498 | 2498 | ||
| 2499 | wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF); | 2499 | wm8904_set_bias_level(codec, SND_SOC_BIAS_OFF); |
| 2500 | regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies); | 2500 | regulator_bulk_free(ARRAY_SIZE(wm8904->supplies), wm8904->supplies); |
| 2501 | kfree(wm8904->retune_mobile_texts); | ||
| 2502 | kfree(wm8904->drc_texts); | ||
| 2501 | 2503 | ||
| 2502 | return 0; | 2504 | return 0; |
| 2503 | } | 2505 | } |