aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-10 06:08:33 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2008-12-10 06:08:33 -0500
commit1e297a19252a6792c4479b300020f7f63eeb56ef (patch)
tree42642bb1c8116d2aca5e2250a27de4ca5a1f5f73 /sound/soc
parentf73f2a6a23e34de9cca9672f727694e5af00e6c7 (diff)
ASoC: Work around warnings from some build environments
BUG() should be marked as not returning but for at least some configurations (including some widely deployed compilers) that's either not happening or being forgotten by the compiler. Add some extra return statements to the affected paths. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm8903.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 0b5bea37e3dc..b1f5cf77a876 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -392,6 +392,7 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,
392 break; 392 break;
393 default: 393 default:
394 BUG(); 394 BUG();
395 return -EINVAL; /* Spurious warning from some compilers */
395 } 396 }
396 397
397 switch (w->shift) { 398 switch (w->shift) {
@@ -403,6 +404,7 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,
403 break; 404 break;
404 default: 405 default:
405 BUG(); 406 BUG();
407 return -EINVAL; /* Spurious warning from some compilers */
406 } 408 }
407 409
408 if (event & SND_SOC_DAPM_PRE_PMU) { 410 if (event & SND_SOC_DAPM_PRE_PMU) {