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

Commit 16aff769 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: Fix return value of ak4641_pcm_set_dai_fmt() 



We can't just pass back the return value of snd_soc_update_bits() as it
will be 1 if a bit changed rather than zero.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 6065abf5

sound/soc/codecs/ak4641.c

+6 −1
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ static int ak4641_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai, 
{

	struct snd_soc_codec *codec = codec_dai->codec;

	u8 btif;

	int ret;



	/* interface format */

	switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
@@ -358,7 +359,11 @@ static int ak4641_pcm_set_dai_fmt(struct snd_soc_dai *codec_dai, 
		return -EINVAL;

	}



	return snd_soc_update_bits(codec, AK4641_BTIF, (0x3 << 5), btif);

	ret = snd_soc_update_bits(codec, AK4641_BTIF, (0x3 << 5), btif);

	if (ret < 0)

		return ret;



	return 0;

}



static int ak4641_i2s_set_dai_fmt(struct snd_soc_dai *codec_dai,