summaryrefslogtreecommitdiff
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-31 09:46:42 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-31 09:46:42 +0100
commit0f8dd4ce4775806196300dc075ba8d4f1f9b605d (patch)
tree97045026e9780707706149b2ad19e4cc24c78d75 /sound/soc/soc-core.c
parent35dcf58634cf696966cdec69f62b14a7f49a8c42 (diff)
parent6c5b756aaa3e4a20c8d4b47b9dc4799b9cfdfcb8 (diff)
downloadlinux-3.10-0f8dd4ce4775806196300dc075ba8d4f1f9b605d.tar.gz
linux-3.10-0f8dd4ce4775806196300dc075ba8d4f1f9b605d.tar.bz2
linux-3.10-0f8dd4ce4775806196300dc075ba8d4f1f9b605d.zip
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fd173f6be18..4065d4e84ea 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1635,7 +1635,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
if (codec->readable_register)
return codec->readable_register(codec, reg);
else
- return 0;
+ return 1;
}
EXPORT_SYMBOL_GPL(snd_soc_codec_readable_register);
@@ -1653,7 +1653,7 @@ int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
if (codec->writable_register)
return codec->writable_register(codec, reg);
else
- return 0;
+ return 1;
}
EXPORT_SYMBOL_GPL(snd_soc_codec_writable_register);