]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: hisilicon: Add error returns even for cases that shouldn't happen.
authorJohn Stultz <john.stultz@linaro.org>
Tue, 11 Apr 2017 19:15:16 +0000 (12:15 -0700)
committerMark Brown <broonie@kernel.org>
Tue, 11 Apr 2017 20:20:44 +0000 (21:20 +0100)
This patch addresses feedback from Mark Brown, adding a few
extra error returns in cases that shouldn't happen

Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/hisilicon/hi6210-i2s.c

index 45691b70060c363ec2038b93925cb96123b1f21b..1909bfc6950a0a26287854e733ffba4c44704827 100644 (file)
@@ -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);