lkml.org 
[lkml]   [2011]   [Oct]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ASoC: Return early with -EINVAL if invalid dai format is detected
Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Cc: Timur Tabi <timur@freescale.com>
> Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
> ---
> sound/soc/codecs/cs4270.c | 2 +-
> sound/soc/codecs/cs42l51.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
> index 5830c93..e645d67 100644
> --- a/sound/soc/codecs/cs4270.c
> +++ b/sound/soc/codecs/cs4270.c
> @@ -271,7 +271,7 @@ static int cs4270_set_dai_fmt(struct snd_soc_dai *codec_dai,
> break;
> default:
> dev_err(codec->dev, "invalid dai format\n");
> - ret = -EINVAL;
> + return -EINVAL;
> }
>

If you're going to make a change like this, I say go all the way:

/* set DAI format */
switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
case SND_SOC_DAIFMT_LEFT_J:
cs4270->mode = format & SND_SOC_DAIFMT_FORMAT_MASK;
break;
default:
dev_err(codec->dev, "invalid dai format\n");
return -EINVAL;
}

/* set master/slave audio interface */
switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS:
cs4270->slave_mode = 1;
break;
case SND_SOC_DAIFMT_CBM_CFM:
cs4270->slave_mode = 0;
break;
default:
/* all other modes are unsupported by the hardware */
---> also add an error message here
return -EINVAL;
}

return 0;

Then you can delete local variable 'ret' altogether.

--
Timur Tabi
Linux kernel developer at Freescale



\
 
 \ /
  Last update: 2011-10-05 18:19    [W:0.046 / U:0.576 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site