Commit 28739dfc authored Aug 22, 2012 by Peter Ujfalusi Committed by Mark Brown Aug 25, 2012

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>

parent eda21d37

sound/soc/omap/omap-mcbsp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

Admin message