diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 05:23:45 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-06 12:24:26 -0500 |
| commit | b93673be48cef887551d109683922bcc15f40d27 (patch) | |
| tree | 5bbad0ce6efdc13b4d2456be54558d291b8adb22 /sound/soc/intel/byt-rt5640.c | |
| parent | 7a81140b0ead01fcb27e6167b1015b06c36acbd0 (diff) | |
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>
Diffstat (limited to 'sound/soc/intel/byt-rt5640.c')
| -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) | |||
| 132 | { | 132 | { |
| 133 | int ret; | 133 | int ret; |
| 134 | struct snd_soc_codec *codec = runtime->codec; | 134 | struct snd_soc_codec *codec = runtime->codec; |
| 135 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
| 136 | struct snd_soc_card *card = runtime->card; | 135 | struct snd_soc_card *card = runtime->card; |
| 137 | const struct snd_soc_dapm_route *custom_map; | 136 | const struct snd_soc_dapm_route *custom_map; |
| 138 | int num_routes; | 137 | int num_routes; |
| @@ -161,7 +160,7 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) | |||
| 161 | num_routes = ARRAY_SIZE(byt_rt5640_intmic_dmic1_map); | 160 | num_routes = ARRAY_SIZE(byt_rt5640_intmic_dmic1_map); |
| 162 | } | 161 | } |
| 163 | 162 | ||
| 164 | ret = snd_soc_dapm_add_routes(dapm, custom_map, num_routes); | 163 | ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes); |
| 165 | if (ret) | 164 | if (ret) |
| 166 | return ret; | 165 | return ret; |
| 167 | 166 | ||