diff options
| author |   Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-22 13:11:40 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-25 13:30:11 -0700 |
| commit | 28739dfcffaad629b28cbab947193b259f745ea9 (patch) | |
| tree | 1bc1a26a8c702494656f48b5bc9963d20cb443bd /sound/soc/omap/omap-mcbsp.c | |
| parent | ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled (diff) | |
| download | linux-dev-28739dfcffaad629b28cbab947193b259f745ea9.tar.xz linux-dev-28739dfcffaad629b28cbab947193b259f745ea9.zip | |
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/soc/omap/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 2 |
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) if (!mcbsp->st_data) return -ENODEV; - switch (cpu_dai->id) { + switch (mcbsp->id) { case 2: /* McBSP 2 */ return snd_soc_add_dai_controls(cpu_dai, omap_mcbsp2_st_controls, |