From: Xiubo Li <Li.Xiubo@freescale.com>
To: <broonie@kernel.org>, <lgirdwood@gmail.com>,
<kuninori.morimoto.gx@renesas.com>
Cc: <rob@landley.net>, <perex@perex.cz>, <moinejf@free.fr>,
<linux-kernel@vger.kernel.org>, <alsa-devel@alsa-project.org>,
Xiubo Li <Li.Xiubo@freescale.com>
Subject: [PATCH v2 1/7] ASoC: simple-card: fix __asoc_simple_card_dai_init
Date: Fri, 24 Jan 2014 15:43:00 +0800 [thread overview]
Message-ID: <1390549386-4702-2-git-send-email-Li.Xiubo@freescale.com> (raw)
In-Reply-To: <1390549386-4702-1-git-send-email-Li.Xiubo@freescale.com>
If the CPU/CODEC DAI set_sysclk() is not support, the -ENOTSUPP will returnd.
Here do the check like set_fmt().
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
sound/soc/generic/simple-card.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 6443c87..6366f3f 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -27,21 +27,29 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
struct asoc_simple_dai *set,
unsigned int daifmt)
{
- int ret = 0;
+ int ret;
daifmt |= set->fmt;
- if (daifmt)
+ if (daifmt) {
ret = snd_soc_dai_set_fmt(dai, daifmt);
-
- if (ret == -ENOTSUPP) {
- dev_dbg(dai->dev, "ASoC: set_fmt is not supported\n");
- ret = 0;
+ if (ret && ret != -ENOTSUPP) {
+ dev_err(dai->dev, "simple-card: set_fmt error\n");
+ goto err;
+ }
}
- if (!ret && set->sysclk)
+ if (set->sysclk) {
ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);
+ if (ret && ret != -ENOTSUPP) {
+ dev_err(dai->dev, "simple-card: set_sysclk error\n");
+ goto err;
+ }
+ }
+
+ ret = 0;
+err:
return ret;
}
--
1.8.4
next prev parent reply other threads:[~2014-01-24 8:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-24 7:42 [PATCH v2 0/7] simple card Xiubo Li
2014-01-24 7:43 ` Xiubo Li [this message]
2014-01-27 19:50 ` [PATCH v2 1/7] ASoC: simple-card: fix __asoc_simple_card_dai_init Mark Brown
2014-01-24 7:43 ` [PATCH v2 2/7] ASoC: simple-card: simplify the daifmt code Xiubo Li
2014-01-27 19:50 ` Mark Brown
2014-01-24 7:43 ` [PATCH v2 3/7] ASoC: simple-card: Add snd_card's name parsing from DT node support Xiubo Li
2014-01-27 19:50 ` Mark Brown
2014-01-24 7:43 ` [PATCH v2 4/7] ASoC: simple-card: add tdm slot supports Xiubo Li
2014-01-27 19:53 ` Mark Brown
2014-01-24 7:43 ` [PATCH v2 5/7] ASoC: add snd_soc_of_parse_audio_simple_widgets for DT Xiubo Li
2014-01-27 19:55 ` Mark Brown
2014-01-29 11:52 ` Li.Xiubo
2014-01-24 7:43 ` [PATCH v2 6/7] ASoC: simple-card: add off-codec widgets supports Xiubo Li
2014-01-27 19:56 ` Mark Brown
2014-01-24 7:43 ` [PATCH v2 7/7] ASoC: binding: for new properties documenting and usage Xiubo Li
2014-01-27 19:58 ` Mark Brown
2014-02-08 8:20 ` Li.Xiubo
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=1390549386-4702-2-git-send-email-Li.Xiubo@freescale.com \
--to=li.xiubo@freescale.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=moinejf@free.fr \
--cc=perex@perex.cz \
--cc=rob@landley.net \
/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®