aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-06 07:11:09 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-06 07:11:09 -0400
commit2a0f5cb32772e9a9560209e241a80bfbbc31dbc3 (patch)
treea56fc2cdcd1e4a091373c330c751b6c3c3cb9cac /sound/soc/codecs
parent374576a8b6f865022c0fd1ca62396889b23d66dd (diff)
parente655a43544bd3c45a83da93b00a4b115b4fa758e (diff)
Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.32
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8940.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index da97aae475a2..1ef2454c5205 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -790,7 +790,7 @@ static int wm8940_register(struct wm8940_priv *wm8940,
790 codec->reg_cache = &wm8940->reg_cache; 790 codec->reg_cache = &wm8940->reg_cache;
791 791
792 ret = snd_soc_codec_set_cache_io(codec, 8, 16, control); 792 ret = snd_soc_codec_set_cache_io(codec, 8, 16, control);
793 if (ret == 0) { 793 if (ret < 0) {
794 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); 794 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
795 return ret; 795 return ret;
796 } 796 }