summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-08-22 13:11:41 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-25 13:30:19 -0700
commit8a88df4cda5eaed97e027f9c9e76012a7113bf9a (patch)
tree6980585f9a5bd483569b481bdf69d5895016bba0 /sound
parent28739dfcffaad629b28cbab947193b259f745ea9 (diff)
downloadop-kernel-dev-8a88df4cda5eaed97e027f9c9e76012a7113bf9a.zip
op-kernel-dev-8a88df4cda5eaed97e027f9c9e76012a7113bf9a.tar.gz
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')
-rw-r--r--sound/soc/omap/omap-mcbsp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 20d30c9..c1f466e 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 */
OpenPOWER on IntegriCloud