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

Cc: Zhangfei Gao <zhangfei....@linaro.org>
Cc: Liam Girdwood <lgirdw...@gmail.com>
Cc: Mark Brown <broo...@kernel.org>
Cc: Jaroslav Kysela <pe...@perex.cz>
Cc: Wei Xu <xuw...@hisilicon.com>
Cc: Rob Herring <robh...@kernel.org>
Cc: Andy Green <a...@warmcat.com>
Cc: Dave Long <dave.l...@linaro.org>
Cc: Guodong Xu <guodong...@linaro.org>
Signed-off-by: John Stultz <john.stu...@linaro.org>
---
 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

Reply via email to