]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ASoC: Work around warnings from some build environments
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 10 Dec 2008 11:08:33 +0000 (11:08 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 10 Dec 2008 11:08:33 +0000 (11:08 +0000)
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>
sound/soc/codecs/wm8903.c

index 0b5bea37e3dc3dfc30f3a4c58be46d3e6783fbd2..b1f5cf77a876f6b8a8633164ccec784009141869 100644 (file)
@@ -392,6 +392,7 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,
                break;
        default:
                BUG();
+               return -EINVAL;  /* Spurious warning from some compilers */
        }
 
        switch (w->shift) {
@@ -403,6 +404,7 @@ static int wm8903_output_event(struct snd_soc_dapm_widget *w,
                break;
        default:
                BUG();
+               return -EINVAL;  /* Spurious warning from some compilers */
        }
 
        if (event & SND_SOC_DAPM_PRE_PMU) {