From: Jean-Francois Moine <moinejf@free.fr>
To: Mark Brown <broonie@kernel.org>,
Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ASoC:kirkwood: Don't raise an error when no DAI format
Date: Sun, 28 Sep 2014 16:19:27 +0200 [thread overview]
Message-ID: <20140928150313.85015260582@alsa0.perex.cz> (raw)
The two DAIs of the kirkwood controller have a unique PCM format.
The simple-card sets the audio hardware definitions of all CPU DAIs.
The PCM format is defined only when it is present in the DT.
This patch prevents the controller to raise an error when
the DT audio card definition by the simple card contains the PCM
format of one CPU DAI only.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
---
sound/soc/kirkwood/kirkwood-i2s.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 0704cd6..26d5f85 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -45,6 +45,8 @@ static int kirkwood_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
unsigned long value;
switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+ case 0:
+ return 0; /* already done (simple-card) */
case SND_SOC_DAIFMT_RIGHT_J:
mask = KIRKWOOD_I2S_CTL_RJ;
break;
--
2.1.1
next reply other threads:[~2014-09-28 15:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-28 14:19 Jean-Francois Moine [this message]
[not found] <20140928150342.CC21B786A1D@smtpfb1-g21.free.fr>
2014-09-28 15:12 ` [PATCH] ASoC:kirkwood: Don't raise an error when no DAI format Russell King - ARM Linux
2014-09-28 16:05 ` Jean-Francois Moine
2014-09-30 18:19 ` Mark Brown
2014-10-01 8:59 ` Jean-Francois Moine
2014-10-01 8:59 ` Jean-Francois Moine
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=20140928150313.85015260582@alsa0.perex.cz \
--to=moinejf@free.fr \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.