From 51a6d346e339bae66ddf8e1ab7ad51afe119fbd9 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Mon, 26 Sep 2011 10:56:42 +0300 Subject: [PATCH] --- yaml --- r: 270665 b: refs/heads/master c: 141947e6ceb8f82fe8382b26f093bb379af9af15 h: refs/heads/master i: 270663: 8a405a4e4e26657a1977c50319560aefd1af0dc1 v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-mcbsp.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e7bcf928f679..91fcf7a12cb0 100644 --- 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 index 478d60778453..1391ea0dd3ce 100644 --- 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 ||