Commit 391d8a04 authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by Mark Brown

ASoC: Return -1 instead of -EINVAL to ensure consistency

The code can't really cope with I/O errors, so it would be better
to be consistent throughout all cache functions and return -1 instead
of -EINVAL.

The return value of snd_soc_read(...) is mostly checked in the probe
function and nowhere else.
Signed-off-by: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 321de0d0
...@@ -228,7 +228,7 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec, ...@@ -228,7 +228,7 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec,
if (reg >= codec->driver->reg_cache_size || if (reg >= codec->driver->reg_cache_size ||
snd_soc_codec_volatile_register(codec, reg)) { snd_soc_codec_volatile_register(codec, reg)) {
if (codec->cache_only) if (codec->cache_only)
return -EINVAL; return -1;
return codec->hw_read(codec, reg); return codec->hw_read(codec, reg);
} else { } else {
...@@ -455,7 +455,7 @@ static unsigned int snd_soc_16_16_read(struct snd_soc_codec *codec, ...@@ -455,7 +455,7 @@ static unsigned int snd_soc_16_16_read(struct snd_soc_codec *codec,
if (reg >= codec->driver->reg_cache_size || if (reg >= codec->driver->reg_cache_size ||
snd_soc_codec_volatile_register(codec, reg)) { snd_soc_codec_volatile_register(codec, reg)) {
if (codec->cache_only) if (codec->cache_only)
return -EINVAL; return -1;
return codec->hw_read(codec, reg); return codec->hw_read(codec, reg);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment