Commit 8a88df4c authored Aug 22, 2012 by Peter Ujfalusi Committed by Mark Brown Aug 25, 2012

ASoC: omap-mcbsp: Only print warning if the st_data is missing for the port



When asked to add the ST controls warn only if the st_data is missing.
In this way we do not block the otherwise functional card to probe.

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 28739dfc

sound/soc/omap/omap-mcbsp.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -719,8 +719,10 @@ int omap_mcbsp_st_add_controls(struct snd_soc_pcm_runtime *rtd)
		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
		struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);

		if (!mcbsp->st_data)
		return -ENODEV;
		if (!mcbsp->st_data) {
		dev_warn(mcbsp->dev, "No sidetone data for port\n");
		return 0;
		}

		switch (mcbsp->id) {
		case 2: /* McBSP 2 */

Admin message