summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/ak4641.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-30 23:34:54 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-02 13:08:33 +0000
commit16aff769d73c6b66a79450d7218f31dc46962536 (patch)
treedad5f8dee4ce8b5be9aef3e5d6855be2e91e2e9a /sound/soc/codecs/ak4641.c
parent6065abf5ce8ba0ad945d21255a1d581ca30f2e18 (diff)
downloadblackbird-op-linux-16aff769d73c6b66a79450d7218f31dc46962536.tar.gz
blackbird-op-linux-16aff769d73c6b66a79450d7218f31dc46962536.zip
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: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ak4641.c')
-rw-r--r--sound/soc/codecs/ak4641.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 266ebea2b65a..c4d165a4bddf 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -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,
OpenPOWER on IntegriCloud