summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-io.c
diff options
context:
space:
mode:
authorMark Brown2011-10-09 15:06:13 +0200
committerMark Brown2011-10-09 15:35:59 +0200
commit3ebb5c9b1056b7eaae3e5dd11b97e2830797e51c (patch)
tree547b4a260aa35e58b147ec1f30ab0b41675c2d74 /sound/soc/soc-io.c
parentASoC: Cache connected input and output recursions (diff)
downloadkernel-qcow2-linux-3ebb5c9b1056b7eaae3e5dd11b97e2830797e51c.tar.gz
kernel-qcow2-linux-3ebb5c9b1056b7eaae3e5dd11b97e2830797e51c.tar.xz
kernel-qcow2-linux-3ebb5c9b1056b7eaae3e5dd11b97e2830797e51c.zip
ASoC: Squash error codes from regmap down to -1 on read
The ASoC code always uses -1 as the error code due to reporting errors in band with the value. Ensure we don't confuse anything by making sure we don't pass actual error codes back into the rest of the code on read. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-io.c')
-rw-r--r--sound/soc/soc-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 66fcccd79efe..dd89933e2c72 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -55,7 +55,7 @@ static unsigned int hw_read(struct snd_soc_codec *codec, unsigned int reg)
if (ret == 0)
return val;
else
- return ret;
+ return -1;
}
ret = snd_soc_cache_read(codec, reg, &val);