aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-09-14 19:11:13 +0200
committerTakashi Iwai <tiwai@suse.de>2011-09-14 19:11:13 +0200
commit4038a12e7443b5fed3e526c475c38c115d9600f6 (patch)
treeb39b8fc13c0761459c6bafa1642c6869c4e5747d /sound/soc/soc-core.c
parentALSA: HDA: Cirrus - fix "Surround Speaker" volume control name (diff)
parentASoC: Fix trivial build regression in Kirkwood I2S (diff)
downloadlinux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.tar.xz
linux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.zip
Merge branch 'fix/asoc' into for-linus
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 b085d8e87574..d2ef014af215 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1633,7 +1633,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);
@@ -1651,7 +1651,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);