summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-09 13:06:13 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-09 13:35:59 (GMT)
commit3ebb5c9b1056b7eaae3e5dd11b97e2830797e51c (patch)
tree547b4a260aa35e58b147ec1f30ab0b41675c2d74
parent024dc078558e64e4cebc62c096285430a61dd10e (diff)
downloadlinux-fsl-qoriq-3ebb5c9b1056b7eaae3e5dd11b97e2830797e51c.tar.xz
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>
-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 66fcccd..dd89933 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);