Commit ab2874a8 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b7580cde

include/sound/soc.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

sound/soc/soc-io.c

+2 −2
Original line number Diff line number Diff line
@@ -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);