summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-04-19 12:43:57 +0400
committerMark Brown <broonie@linaro.org>2014-04-21 14:21:25 +0400
commitab2874a8faac9db00eb03ec831b9a983627fb2d1 (patch)
tree3cc7f1007d4c3ff3b62fe6a06fefd6bc348aa782 /sound
parentb7580cde704920da69e50d133cea16eca77ff3bd (diff)
downloadlinux-ab2874a8faac9db00eb03ec831b9a983627fb2d1.tar.xz
ASoC: Change return type of snd_soc_write() to int
The CODEC's write callback can return a negative error code, make sure to pass that on correctly. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 31ddd52c72fc..5fb85783b044 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -31,8 +31,8 @@ unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg)
}
EXPORT_SYMBOL_GPL(snd_soc_read);
-unsigned int snd_soc_write(struct snd_soc_codec *codec,
- unsigned int reg, unsigned int val)
+int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,
+ unsigned int val)
{
dev_dbg(codec->dev, "write %x = %x\n", reg, val);
trace_snd_soc_reg_write(codec, reg, val);