summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-03-12 15:27:32 +0100
committerMark Brown <broonie@linaro.org>2014-03-13 19:10:21 +0000
commit7f0af4ae86110c46b43fb57f2e0002aa81ca6a67 (patch)
tree2c232af897a91c6a062ad2d9b7b698e5cd7893ac /sound
parent7cb5e1bb9f91bf984f26b520072a22610235d869 (diff)
downloadlinux-stable-7f0af4ae86110c46b43fb57f2e0002aa81ca6a67.tar.gz
linux-stable-7f0af4ae86110c46b43fb57f2e0002aa81ca6a67.tar.bz2
linux-stable-7f0af4ae86110c46b43fb57f2e0002aa81ca6a67.zip
ASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the card
Machine level DAPM widgets and routes should be registered in the card's DAPM context, rather than in the CODEC's context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap-abe-twl6040.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c
index ebb13906b3a0..024dafc3e298 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/omap/omap-abe-twl6040.c
@@ -203,8 +203,7 @@ static const struct snd_soc_dapm_route dmic_audio_map[] = {
static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)
{
- struct snd_soc_codec *codec = rtd->codec;
- struct snd_soc_dapm_context *dapm = &codec->dapm;
+ struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
return snd_soc_dapm_add_routes(dapm, dmic_audio_map,
ARRAY_SIZE(dmic_audio_map));