From: Michael Opdenacker <michael.opdenacker@linaro.org>
To: jarkko.nikula@bitmer.com, lrg@ti.com,
broonie@opensource.wolfsonmicro.com, perex@perex.cz,
tiwai@suse.de
Cc: linux-omap@vger.kernel.org, alsa-devel@alsa-project.org,
linux-kernel@vger.kernel.org,
Michael Opdenacker <michael.opdenacker@linaro.org>
Subject: [PATCH 1/2] omap: sound: fix "ambiguous else" warning
Date: Mon, 10 Oct 2011 07:07:07 +0200 [thread overview]
Message-ID: <1318223228-15671-2-git-send-email-michael.opdenacker@linaro.org> (raw)
In-Reply-To: <1318223228-15671-1-git-send-email-michael.opdenacker@linaro.org>
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@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
next prev parent reply other threads:[~2011-10-10 5:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-10 5:07 [PATCH 0/2] omap: sound: style and warning fixes Michael Opdenacker
2011-10-10 5:07 ` Michael Opdenacker [this message]
2011-10-10 6:54 ` [PATCH 1/2] omap: sound: fix "ambiguous else" warning Jarkko Nikula
2011-10-10 7:38 ` Michael Opdenacker
2011-10-10 5:07 ` [PATCH 2/2] omap: sound: fix checkpatch.pl error Michael Opdenacker
2011-10-10 6:56 ` Jarkko Nikula
2011-10-10 9:32 ` Mark Brown
2011-10-10 13:03 ` Michael Opdenacker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318223228-15671-2-git-send-email-michael.opdenacker@linaro.org \
--to=michael.opdenacker@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=jarkko.nikula@bitmer.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®