diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:24 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:24 +0000 |
| commit | 8b880f48eef80309da6d1c40f7526614b19ab12c (patch) | |
| tree | 1ae728f4e2c4020d62940e8cdae75a5352bc3ae1 /sound/soc/generic/simple-card.c | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
| parent | 63e6d43bf80d3861dcda7ff4f37590f8de583156 (diff) | |
| download | linux-8b880f48eef80309da6d1c40f7526614b19ab12c.tar.gz linux-8b880f48eef80309da6d1c40f7526614b19ab12c.tar.bz2 linux-8b880f48eef80309da6d1c40f7526614b19ab12c.zip | |
Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linus
Diffstat (limited to 'sound/soc/generic/simple-card.c')
| -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); |