diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-18 22:19:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-18 22:19:03 -0800 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /sound/soc/codecs/wm8940.c | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
| download | op-kernel-dev-3505d1a9fd65e2d3e00827857b6795d9d8983658.zip op-kernel-dev-3505d1a9fd65e2d3e00827857b6795d9d8983658.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'sound/soc/codecs/wm8940.c')
| -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 da97aae..1ef2454 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; } |
