From: Lars-Peter Clausen Date: Wed, 12 Mar 2014 14:27:32 +0000 (+0100) Subject: ASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the card X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f0af4ae86110c46b43fb57f2e0002aa81ca6a67;p=linux-beck.git 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 Acked-by: Peter Ujfalusi Signed-off-by: Mark Brown --- 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));