* [PATCH v2] ASoC: Return early with -EINVAL if invalid dai format is detected
@ 2011-10-05 23:29 Axel Lin
2011-10-06 3:30 ` Tabi Timur-B04825
2011-10-06 10:51 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2011-10-05 23:29 UTC (permalink / raw)
To: linux-kernel; +Cc: Timur Tabi, Liam Girdwood, Mark Brown, alsa-devel
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 | 8 ++++----
sound/soc/codecs/cs42l51.c | 9 ++++-----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c
index 5830c93..f1f237e 100644
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
@@ -261,7 +261,6 @@ static int cs4270_set_dai_fmt(struct snd_soc_dai *codec_dai,
{
struct snd_soc_codec *codec = codec_dai->codec;
struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
- int ret = 0;
/* set DAI format */
switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
@@ -271,7 +270,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;
}
/* set master/slave audio interface */
@@ -284,10 +283,11 @@ static int cs4270_set_dai_fmt(struct snd_soc_dai *codec_dai,
break;
default:
/* all other modes are unsupported by the hardware */
- ret = -EINVAL;
+ dev_err(codec->dev, "Unknown master/slave configuration\n");
+ return -EINVAL;
}
- return ret;
+ return 0;
}
/**
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 286878d..8c3c820 100644
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -288,7 +288,6 @@ static int cs42l51_set_dai_fmt(struct snd_soc_dai *codec_dai,
{
struct snd_soc_codec *codec = codec_dai->codec;
struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec);
- int ret = 0;
switch (format & SND_SOC_DAIFMT_FORMAT_MASK) {
case SND_SOC_DAIFMT_I2S:
@@ -298,7 +297,7 @@ static int cs42l51_set_dai_fmt(struct snd_soc_dai *codec_dai,
break;
default:
dev_err(codec->dev, "invalid DAI format\n");
- ret = -EINVAL;
+ return -EINVAL;
}
switch (format & SND_SOC_DAIFMT_MASTER_MASK) {
@@ -309,11 +308,11 @@ static int cs42l51_set_dai_fmt(struct snd_soc_dai *codec_dai,
cs42l51->func = MODE_SLAVE_AUTO;
break;
default:
- ret = -EINVAL;
- break;
+ dev_err(codec->dev, "Unknown master/slave configuration\n");
+ return -EINVAL;
}
- return ret;
+ return 0;
}
struct cs42l51_ratios {
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] ASoC: Return early with -EINVAL if invalid dai format is detected
2011-10-05 23:29 [PATCH v2] ASoC: Return early with -EINVAL if invalid dai format is detected Axel Lin
@ 2011-10-06 3:30 ` Tabi Timur-B04825
2011-10-06 10:51 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Tabi Timur-B04825 @ 2011-10-06 3:30 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel@vger.kernel.org, Liam Girdwood, Mark Brown,
alsa-devel@alsa-project.org
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>
> ---
Acked-by: Timur Tabi <timur@freescale.com>
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] ASoC: Return early with -EINVAL if invalid dai format is detected
2011-10-05 23:29 [PATCH v2] ASoC: Return early with -EINVAL if invalid dai format is detected Axel Lin
2011-10-06 3:30 ` Tabi Timur-B04825
@ 2011-10-06 10:51 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-10-06 10:51 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Timur Tabi, Liam Girdwood, alsa-devel
On Thu, Oct 06, 2011 at 07:29:56AM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-10-06 10:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-05 23:29 [PATCH v2] ASoC: Return early with -EINVAL if invalid dai format is detected Axel Lin
2011-10-06 3:30 ` Tabi Timur-B04825
2011-10-06 10:51 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox