diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-22 12:11:41 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-25 22:30:19 +0200 |
| commit | 8a88df4cda5eaed97e027f9c9e76012a7113bf9a (patch) | |
| tree | 6980585f9a5bd483569b481bdf69d5895016bba0 /sound/soc/omap/omap-mcbsp.c | |
| parent | ASoC: omap-mcbsp: Check mcbsp->id instead of cpu_dai->id when adding ST controls (diff) | |
| download | linux-8a88df4cda5eaed97e027f9c9e76012a7113bf9a.tar.xz linux-8a88df4cda5eaed97e027f9c9e76012a7113bf9a.zip | |
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>
Diffstat (limited to 'sound/soc/omap/omap-mcbsp.c')
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 20d30c9ae573..c1f466e1b8b6 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -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 */ |