[alsa-devel] [PATCH 1/2] omap: sound: fix "ambiguous else" warning

Michael Opdenacker michael.opdenacker at linaro.org
Mon Oct 10 07:07:07 CEST 2011


This patch applies against Tony Lindgren's linux-omap tree
It fixes "ambiguous else" warnings at compile time.

Signed-off-by: Michael Opdenacker <michael.opdenacker at linaro.org>
---
 sound/soc/omap/omap-mcbsp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 478d607..1391ea0 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 ||
-- 
1.7.4.1



More information about the Alsa-devel mailing list