[alsa-devel] [PATCH -next] ASoC: cs42l52: fix the return value of cs42l52_set_fmt()

Mark Brown broonie at opensource.wolfsonmicro.com
Wed Nov 7 15:50:46 CET 2012


On Wed, Nov 07, 2012 at 08:38:35PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei at trendmicro.com.cn>
> 
> Fix the return value of cs42l52_set_fmt() when clock inversion is
> not allowed and also remove the useless variable ret.

Applied, but you need to work on your changelogs:

What is wrong with the return value?

>  	u8 iface = 0;
>  
>  	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
> @@ -822,7 +821,7 @@ static int cs42l52_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
>  	case SND_SOC_DAIFMT_NB_IF:
>  		break;
>  	default:
> -		ret = -EINVAL;
> +		return -EINVAL;
>  	}
>  	cs42l52->config.format = iface;
>  	snd_soc_write(codec, CS42L52_IFACE_CTL1, cs42l52->config.format);
> 

This doesn't look like it changes the return value...  the actual issue
here is that we don't pay attention to ret later on, we just always
return 0.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20121107/1ed7f8eb/attachment.sig>


More information about the Alsa-devel mailing list