diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-05 10:36:28 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-05 10:36:28 +0100 |
commit | d4a8da910e6db53d45ff76f7fdc584376de542df (patch) | |
tree | f94af5b586891834401469b3e90f64c8e4a2d171 /sound/soc/codecs | |
parent | ce3e3737a3361e0c7030f8598eec36bb82050de6 (diff) | |
parent | e655a43544bd3c45a83da93b00a4b115b4fa758e (diff) | |
download | linux-d4a8da910e6db53d45ff76f7fdc584376de542df.tar.gz linux-d4a8da910e6db53d45ff76f7fdc584376de542df.tar.bz2 linux-d4a8da910e6db53d45ff76f7fdc584376de542df.zip |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/wm8940.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 914d788a2b76..1685cfb993c6 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, codec->reg_cache = &wm8940->reg_cache; ret = snd_soc_codec_set_cache_io(codec, 8, 16, control); - if (ret == 0) { + if (ret < 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); return ret; } |