aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-10-17 22:46:49 -0700
committerJon Medhurst <tixy@linaro.org>2015-06-30 10:13:01 +0100
commitbb581905857aba0d5f28d87c0ec4af1e56cbe675 (patch)
tree0f78f2e255d9fe5613ca11fcabf34c6874ff4da4
parent1cdfac190cedd6b5b64384a442f7a97d1dd665a7 (diff)
ASoC: simple-card: un-implemented set_fmt is not error
Current simple-card returns error if DAI doesn't support .set_fmt callback. But the error is -ENOTSUPP (= not supported), and it is not error. This patch avoids such case Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@linaro.org> (cherry picked from commit e244bb9bc1883547d44642c99f483c2e57e2a940) Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--sound/soc/generic/simple-card.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 8c49147db84c..b2fbb7075a6c 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -27,6 +27,11 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
if (!ret && 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 && set->sysclk)
ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);