[alsa-devel] [PATCH 2/3] ASoC: omap-mcbsp: Only print warning if the st_data is missing for the port
Peter Ujfalusi
peter.ujfalusi at ti.com
Tue Aug 21 16:42:02 CEST 2012
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 at ti.com>
---
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 84a3132..c964f68 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 */
--
1.7.8.6
More information about the Alsa-devel
mailing list