Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4763ebe2 authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown
Browse files

ASoC: simple-card: fix __asoc_simple_card_dai_init 



If the CPU/CODEC DAI set_sysclk() is not support, the -ENOTSUPP will returnd.
Here do the check like set_fmt().

Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b367a325

sound/soc/generic/simple-card.c

+15 −7
Original line number Diff line number Diff line
@@ -27,21 +27,29 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, 
				       struct asoc_simple_dai *set,

				       unsigned int daifmt)

{

	int ret = 0;

	int ret;



	daifmt |= set->fmt;



	if (daifmt)

	if (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 && ret != -ENOTSUPP) {

			dev_err(dai->dev, "simple-card: set_fmt error\n");

			goto err;

		}

	}



	if (!ret && set->sysclk)

	if (set->sysclk) {

		ret = snd_soc_dai_set_sysclk(dai, 0, set->sysclk, 0);

		if (ret && ret != -ENOTSUPP) {

			dev_err(dai->dev, "simple-card: set_sysclk error\n");

			goto err;

		}

	}



	ret = 0;



err:

	return ret;

}