commit ab2874a8faac9db00eb03ec831b9a983627fb2d1
author Lars-Peter Clausen <lars@metafoo.de> Sat Apr 19 10:43:57 2014 +0200
committer Mark Brown <broonie@linaro.org> Mon Apr 21 11:21:25 2014 +0100
tree 3cc7f1007d4c3ff3b62fe6a06fefd6bc348aa782
parent b7580cde704920da69e50d133cea16eca77ff3bd

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>

include/sound/soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 81bc331..192ddc4 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1125,8 +1125,8 @@
 
 /* codec IO */
 unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
-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);
 
 /* device driver data */
 

sound/soc/soc-io.c

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 31ddd52..5fb8578 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -31,8 +31,8 @@
 }
 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);