diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:35 +0000 |
| commit | 8bffb007a5e58480de63757a793bc8c863124aa9 (patch) | |
| tree | db2710873b0e233677cef9474fc854ce3b07e7a3 /sound/soc | |
| parent | 6a2972b363e8ca23edcd2c7a14e92fc04462e590 (diff) | |
| parent | e244bb9bc1883547d44642c99f483c2e57e2a940 (diff) | |
| download | blackbird-obmc-linux-8bffb007a5e58480de63757a793bc8c863124aa9.tar.gz blackbird-obmc-linux-8bffb007a5e58480de63757a793bc8c863124aa9.zip | |
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 5 |
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); |
