Merge remote-tracking branch 'asoc/topic/simple' into asoc-next

This commit is contained in:
Mark Brown 2013-10-24 11:24:12 +01:00
commit ccc6d1922e

View File

@ -27,6 +27,11 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
if (!ret && daifmt) if (!ret && daifmt)
ret = snd_soc_dai_set_fmt(dai, 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) if (!ret && set->sysclk)
ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0); ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);