diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-06-18 10:36:00 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-06-18 10:36:00 +0400 |
| commit | ef890ae9b34cd99411bc72829944c74d2223ef70 (patch) | |
| tree | 414850284836df5a7180b43618df279653f9c294 /sound/soc/tegra/tegra_wm8903.c | |
| parent | 2e8b2b29d1f904353c3e54b342ccb8c66390dab8 (diff) | |
| parent | 3419ae781f1592b3d367107db6500090495490cd (diff) | |
| download | linux-ef890ae9b34cd99411bc72829944c74d2223ef70.tar.xz | |
Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for 3.5
All driver specific and fairly small. The pxa-ssp changes are larger
than I'd like but they're build failures and are pretty clear to
inspection.
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
| -rw-r--r-- | sound/soc/tegra/tegra_wm8903.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 0b0df49d9d33..3b6da91188a9 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -346,6 +346,17 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) return 0; } +static int tegra_wm8903_remove(struct snd_soc_card *card) +{ + struct snd_soc_pcm_runtime *rtd = &(card->rtd[0]); + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_codec *codec = codec_dai->codec; + + wm8903_mic_detect(codec, NULL, 0, 0); + + return 0; +} + static struct snd_soc_dai_link tegra_wm8903_dai = { .name = "WM8903", .stream_name = "WM8903 PCM", @@ -363,6 +374,8 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = { .dai_link = &tegra_wm8903_dai, .num_links = 1, + .remove = tegra_wm8903_remove, + .controls = tegra_wm8903_controls, .num_controls = ARRAY_SIZE(tegra_wm8903_controls), .dapm_widgets = tegra_wm8903_dapm_widgets, |