aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-08-22 06:11:40 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-25 16:30:11 -0400
commit28739dfcffaad629b28cbab947193b259f745ea9 (patch)
tree1bc1a26a8c702494656f48b5bc9963d20cb443bd /sound
parenteda21d37eb1e7d065d0427679d0947da805ad35d (diff)
ASoC: omap-mcbsp: Check mcbsp->id instead of cpu_dai->id when adding ST controls
In ddevice tree booted kernel all device have unique name and their device id is set to 0. Use the mcbsp->id for checking to decide which control set we should add for McBSP sidetone handling. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap-mcbsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 2e1750e2ab31..20d30c9ae573 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -722,7 +722,7 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
722 if (!mcbsp->st_data) 722 if (!mcbsp->st_data)
723 return -ENODEV; 723 return -ENODEV;
724 724
725 switch (cpu_dai->id) { 725 switch (mcbsp->id) {
726 case 2: /* McBSP 2 */ 726 case 2: /* McBSP 2 */
727 return snd_soc_add_dai_controls(cpu_dai, 727 return snd_soc_add_dai_controls(cpu_dai,
728 omap_mcbsp2_st_controls, 728 omap_mcbsp2_st_controls,