summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-09-26 10:56:42 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-26 09:57:35 +0100
commit141947e6ceb8f82fe8382b26f093bb379af9af15 (patch)
treec9de93d7d039e46f9d3f5561a54b8b77d99b21f5 /sound/soc/omap
parenta850260e4722706805fda3a0f6e5bc1539e83bac (diff)
downloadlinux-stable-141947e6ceb8f82fe8382b26f093bb379af9af15.tar.gz
linux-stable-141947e6ceb8f82fe8382b26f093bb379af9af15.tar.bz2
linux-stable-141947e6ceb8f82fe8382b26f093bb379af9af15.zip
ASoC: omap-mcbsp: Fix compile time warning about ambiguous ‘else’
Fixes the following compile time warning: omap-mcbsp.c:519: warning: suggest explicit braces to avoid ambiguous ‘else’ 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')
-rw-r--r--sound/soc/omap/omap-mcbsp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 478d60778453..1391ea0dd3ce 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -516,11 +516,12 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs;
int err = 0;
- if (mcbsp_data->active)
+ if (mcbsp_data->active) {
if (freq == mcbsp_data->in_freq)
return 0;
else
return -EBUSY;
+ }
/* The McBSP signal muxing functions are only available on McBSP1 */
if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR ||