[alsa-devel] [PATCH] ASoC: Return -1 instead of -EINVAL to ensure consistency

[Liam Girdwood]

On Tue, 2010-09-21 at 17:04 +0100, Dimitris Papastamos wrote:
> 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.
> ---
>  sound/soc/soc-cache.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
> index 28bf1ff..6702a3d 100644
> --- a/sound/soc/soc-cache.c
> +++ b/sound/soc/soc-cache.c
> @@ -228,7 +228,7 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec,
>  	if (reg >= codec->driver->reg_cache_size ||
>  	    snd_soc_codec_volatile_register(codec, reg)) {
>  		if (codec->cache_only)
> -			return -EINVAL;
> +			return -1;
>  
>  		return codec->hw_read(codec, reg);
>  	} else {
> @@ -455,7 +455,7 @@ static unsigned int snd_soc_16_16_read(struct snd_soc_codec *codec,
>  	if (reg >= codec->driver->reg_cache_size ||
>  	    snd_soc_codec_volatile_register(codec, reg)) {
>  		if (codec->cache_only)
> -			return -EINVAL;
> +			return -1;
>  
>  		return codec->hw_read(codec, reg);
>  	}

Acked-by: Liam Girdwood <lrg at slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk