diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:12 +0100 |
| commit | ccc6d1922e5065ae130c07956d36bc3824595c9f (patch) | |
| tree | dc6a45b5e849ecb8a8adbb86a45a086a333e055c /sound | |
| parent | f6b967ab1beeed71d72727684ff3ec5906ed5e98 (diff) | |
| parent | e244bb9bc1883547d44642c99f483c2e57e2a940 (diff) | |
| download | linux-ccc6d1922e5065ae130c07956d36bc3824595c9f.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
Diffstat (limited to 'sound')
| -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); |