diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-09-15 11:42:21 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-16 11:47:28 -0400 |
commit | 56efaed524dc2c3571f66d296cb1efbd59cb2996 (patch) | |
tree | f46bd8cea3894281261b02a2ec6bbc87a7adf0c6 | |
parent | df7c52168ee15b3951b50078c0c3960598eb0109 (diff) |
ASoC: rt5663: refine error handling
The newly added rt5663 codec driver introduces a couple of warnings
when built with -Wmaybe-uninitialized:
codecs/rt5663.c: In function 'rt5663_set_tdm_slot':
codecs/rt5663.c:2680:2: error: 'reg' may be used uninitialized in this function [-Werror=maybe-uninitialized]
codecs/rt5663.c: In function 'rt5663_set_dai_pll':
codecs/rt5663.c:2556:12: error: 'shift' may be used uninitialized in this function [-Werror=maybe-uninitialized]
codecs/rt5663.c:2596:2: error: 'mask' may be used uninitialized in this function [-Werror=maybe-uninitialized]
We can avoid those warnings by always returning an error
from the switch() statements instead of falling through
with an uninitialized variable when we hit an unexpected
case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: df7c52168ee1 ("ASoC: add rt5663 codec driver")
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/rt5663.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c index 7963a2736a91..8078abcaf728 100644 --- a/sound/soc/codecs/rt5663.c +++ b/sound/soc/codecs/rt5663.c | |||
@@ -1831,6 +1831,7 @@ static int rt5663_i2s_use_asrc(struct snd_soc_dapm_widget *source, | |||
1831 | break; | 1831 | break; |
1832 | default: | 1832 | default: |
1833 | dev_err(codec->dev, "Unknown CODEC_TYPE\n"); | 1833 | dev_err(codec->dev, "Unknown CODEC_TYPE\n"); |
1834 | return 1; | ||
1834 | } | 1835 | } |
1835 | 1836 | ||
1836 | if (da_asrc_en || ad_asrc_en) | 1837 | if (da_asrc_en || ad_asrc_en) |
@@ -2579,6 +2580,7 @@ static int rt5663_set_dai_pll(struct snd_soc_dai *dai, int pll_id, int source, | |||
2579 | break; | 2580 | break; |
2580 | default: | 2581 | default: |
2581 | dev_err(codec->dev, "Unknown CODEC_TYPE\n"); | 2582 | dev_err(codec->dev, "Unknown CODEC_TYPE\n"); |
2583 | return -EINVAL; | ||
2582 | } | 2584 | } |
2583 | 2585 | ||
2584 | switch (source) { | 2586 | switch (source) { |
@@ -2674,6 +2676,7 @@ static int rt5663_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, | |||
2674 | break; | 2676 | break; |
2675 | default: | 2677 | default: |
2676 | dev_err(codec->dev, "Unknown CODEC_TYPE\n"); | 2678 | dev_err(codec->dev, "Unknown CODEC_TYPE\n"); |
2679 | return -EINVAL; | ||
2677 | } | 2680 | } |
2678 | 2681 | ||
2679 | snd_soc_update_bits(codec, reg, RT5668_TDM_MODE_MASK | | 2682 | snd_soc_update_bits(codec, reg, RT5668_TDM_MODE_MASK | |