From bcc9758933fd38015749c80b21e7f79b50e82f6b Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 22 Aug 2012 13:11:41 +0300 Subject: [PATCH] --- yaml --- r: 332032 b: refs/heads/master c: 8a88df4cda5eaed97e027f9c9e76012a7113bf9a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-mcbsp.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 46535e4af439..519429fd2af4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28739dfcffaad629b28cbab947193b259f745ea9 +refs/heads/master: 8a88df4cda5eaed97e027f9c9e76012a7113bf9a diff --git a/trunk/sound/soc/omap/omap-mcbsp.c b/trunk/sound/soc/omap/omap-mcbsp.c index 20d30c9ae573..c1f466e1b8b6 100644 --- a/trunk/sound/soc/omap/omap-mcbsp.c +++ b/trunk/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 */