Browse Source

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>
Lars-Peter Clausen 11 years ago
parent
commit
ab2874a8fa
2 changed files with 4 additions and 4 deletions
  1. 2 2
      include/sound/soc.h
  2. 2 2
      sound/soc/soc-io.c

+ 2 - 2
include/sound/soc.h

@@ -1125,8 +1125,8 @@ static inline struct snd_soc_platform *snd_soc_component_to_platform(
 
 
 /* codec IO */
 /* codec IO */
 unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);
 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 */
 /* device driver data */
 
 

+ 2 - 2
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);
 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);
 	dev_dbg(codec->dev, "write %x = %x\n", reg, val);
 	trace_snd_soc_reg_write(codec, reg, val);
 	trace_snd_soc_reg_write(codec, reg, val);