[PATCH 1/3] ASoC: hisilicon: Add error returns even for cases that shouldn't happen.

From: John Stultz
Date: Tue Apr 11 2017 - 15:15:32 EST


This patch addresses feedback from Mark Brown, adding a few
extra error returns in cases that shouldn't happen

Cc: Zhangfei Gao <zhangfei.gao@xxxxxxxxxx>
Cc: Liam Girdwood <lgirdwood@xxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Cc: Jaroslav Kysela <perex@xxxxxxxx>
Cc: Wei Xu <xuwei5@xxxxxxxxxxxxx>
Cc: Rob Herring <robh+dt@xxxxxxxxxx>
Cc: Andy Green <andy@xxxxxxxxxxx>
Cc: Dave Long <dave.long@xxxxxxxxxx>
Cc: Guodong Xu <guodong.xu@xxxxxxxxxx>
Signed-off-by: John Stultz <john.stultz@xxxxxxxxxx>
---
sound/soc/hisilicon/hi6210-i2s.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/sound/soc/hisilicon/hi6210-i2s.c b/sound/soc/hisilicon/hi6210-i2s.c
index 45691b70..1909bfc 100644
--- a/sound/soc/hisilicon/hi6210-i2s.c
+++ b/sound/soc/hisilicon/hi6210-i2s.c
@@ -395,6 +395,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream,
break;
default:
WARN_ONCE(1, "Invalid i2s->fmt MASTER_MASK. This shouldn't happen\n");
+ return -EINVAL;
}

switch (i2s->format & SND_SOC_DAIFMT_FORMAT_MASK) {
@@ -409,6 +410,7 @@ static int hi6210_i2s_hw_params(struct snd_pcm_substream *substream,
break;
default:
WARN_ONCE(1, "Invalid i2s->fmt FORMAT_MASK. This shouldn't happen\n");
+ return -EINVAL;
}

val = hi6210_read_reg(i2s, HII2S_I2S_CFG);
--
2.7.4