From 49ef204f451c822201997e4c6b03d3b567a078ed Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 30 Dec 2011 23:34:54 +0800 Subject: [PATCH] --- yaml --- r: 284068 b: refs/heads/master c: 16aff769d73c6b66a79450d7218f31dc46962536 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/ak4641.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dfa7f1c73b36..fab05192d651 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6065abf5ce8ba0ad945d21255a1d581ca30f2e18 +refs/heads/master: 16aff769d73c6b66a79450d7218f31dc46962536 diff --git a/trunk/sound/soc/codecs/ak4641.c b/trunk/sound/soc/codecs/ak4641.c index 266ebea2b65a..c4d165a4bddf 100644 --- a/trunk/sound/soc/codecs/ak4641.c +++ b/trunk/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,