From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sat, 19 Apr 2014 08:43:57 +0000 (+0200)
Subject: ASoC: Change return type of snd_soc_write() to int
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab2874a8faac9db00eb03ec831b9a983627fb2d1;p=linux-beck.git

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>
---

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 81bc331c520f..192ddc40ae0a 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1125,8 +1125,8 @@ static inline struct snd_soc_platform *snd_soc_component_to_platform(
 
 /* 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 */
 
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);