diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 13:23:45 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-06 20:24:26 +0300 |
| commit | b93673be48cef887551d109683922bcc15f40d27 (patch) | |
| tree | 5bbad0ce6efdc13b4d2456be54558d291b8adb22 | |
| parent | 7a81140b0ead01fcb27e6167b1015b06c36acbd0 (diff) | |
| download | linux-b93673be48cef887551d109683922bcc15f40d27.tar.xz | |
ASoC: byt-rt5640: Register microphone routes with the card DAPM context
Board level DAPM elements should be registered with the card's DAPM context
rather than the CODEC's DAPM context.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/intel/byt-rt5640.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c index a51856e91826..354eaad886e1 100644 --- a/sound/soc/intel/byt-rt5640.c +++ b/sound/soc/intel/byt-rt5640.c @@ -132,7 +132,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) { int ret; struct snd_soc_codec *codec = runtime->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_card *card = runtime->card; const struct snd_soc_dapm_route *custom_map; int num_routes; @@ -161,7 +160,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) num_routes = ARRAY_SIZE(byt_rt5640_intmic_dmic1_map); } - ret = snd_soc_dapm_add_routes(dapm, custom_map, num_routes); + ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes); if (ret) return ret; |