diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-26 17:17:42 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-26 17:17:42 +0100 |
| commit | 37fa84d8e647e584bf1b71bdff0330049e34f5ef (patch) | |
| tree | 6575dc8f4771be4677a2810756b1be518db1eb55 /sound/soc/codecs/wm8994.c | |
| parent | 5a8cfb4e8ae317d283f84122ed20faa069c5e0c4 (diff) | |
| parent | 25436180ee8bed6740f29d92c2030c759885c147 (diff) | |
| download | op-kernel-dev-37fa84d8e647e584bf1b71bdff0330049e34f5ef.zip op-kernel-dev-37fa84d8e647e584bf1b71bdff0330049e34f5ef.tar.gz | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 830dfdd66..4d3e6f1 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -4061,6 +4061,8 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC2_DET, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_SHRT, wm8994); wm8994_free_irq(codec->control_data, WM8994_IRQ_MIC1_DET, wm8994); + kfree(wm8994->retune_mobile_texts); + kfree(wm8994->drc_texts); kfree(wm8994); return 0; @@ -4073,6 +4075,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8994 = { .resume = wm8994_resume, .read = wm8994_read, .write = wm8994_write, + .readable_register = wm8994_readable, + .volatile_register = wm8994_volatile, .set_bias_level = wm8994_set_bias_level, }; |
