diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-08-22 06:11:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-25 16:30:19 -0400 |
commit | 8a88df4cda5eaed97e027f9c9e76012a7113bf9a (patch) | |
tree | 6980585f9a5bd483569b481bdf69d5895016bba0 /sound/soc/omap/omap-mcbsp.c | |
parent | 28739dfcffaad629b28cbab947193b259f745ea9 (diff) |
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) | |||
719 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 719 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
720 | struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); | 720 | struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); |
721 | 721 | ||
722 | if (!mcbsp->st_data) | 722 | if (!mcbsp->st_data) { |
723 | return -ENODEV; | 723 | dev_warn(mcbsp->dev, "No sidetone data for port\n"); |
724 | return 0; | ||
725 | } | ||
724 | 726 | ||
725 | switch (mcbsp->id) { | 727 | switch (mcbsp->id) { |
726 | case 2: /* McBSP 2 */ | 728 | case 2: /* McBSP 2 */ |