---

yaml --- r: 270665 b: refs/heads/master c: 141947e h: refs/heads/master i: 270663: 8a405a4 v: v3
git-mirror · Sep 26, 2011 · 51a6d34 · 51a6d34
1 parent 9c82c8e
commit 51a6d34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a850260e4722706805fda3a0f6e5bc1539e83bac
+refs/heads/master: 141947e6ceb8f82fe8382b26f093bb379af9af15
diff --git a/trunk/sound/soc/omap/omap-mcbsp.c b/trunk/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 ||