ASoC: rt5665: Fix uninitialized warning in rt5665_i2s_pin_event()

With gcc 4.1.2:

    sound/soc/codecs/rt5665.c: In function ‘rt5665_i2s_pin_event’:
    sound/soc/codecs/rt5665.c:2610: warning: ‘mask1’ may be used uninitialized in this function
    sound/soc/codecs/rt5665.c:2610: warning: ‘val2’ may be used uninitialized in this function
    sound/soc/codecs/rt5665.c:2610: warning: ‘val1’ may be used uninitialized in this function

The first one is currently a false positive, as rt5665_i2s_pin_event()
is never called with snd_soc_dapm_widget.shift set to a value not
handled by the switch() statement.  But that may change, so
preinitialize mask1 to fix this, like is already done for mask2.

The last two are false-positives, the compiler is just not smart enough
to notice the mask and val variables are always used together.

Fixes: 9b5d3865b3b410d2 ("ASoC: rt5665: set i2s pin share configuration")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c
index 26bf157ca29369ba4233c7dca32ae6c2f793d452..c0f36d85ee4d50c3bf6a794b5153414746b47e81 100644 (file)
--- a/sound/soc/codecs/rt5665.c
+++ b/sound/soc/codecs/rt5665.c
@@ -2607,7 +2607,7 @@ static int rt5665_i2s_pin_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *kcontrol, int event)
 {
        struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);
-       unsigned int val1, val2, mask1, mask2 = 0;
+       unsigned int val1, val2, mask1 = 0, mask2 = 0;
 
        switch (w->shift) {
        case RT5665_PWR_I2S2_1_BIT:
@@ -2635,13 +2635,17 @@ static int rt5665_i2s_pin_event(struct snd_soc_dapm_widget *w,
        }
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
-               snd_soc_update_bits(codec, RT5665_GPIO_CTRL_1, mask1, val1);
+               if (mask1)
+                       snd_soc_update_bits(codec, RT5665_GPIO_CTRL_1,
+                                           mask1, val1);
                if (mask2)
                        snd_soc_update_bits(codec, RT5665_GPIO_CTRL_2,
                                            mask2, val2);
                break;
        case SND_SOC_DAPM_POST_PMD:
-               snd_soc_update_bits(codec, RT5665_GPIO_CTRL_1, mask1, 0);
+               if (mask1)
+                       snd_soc_update_bits(codec, RT5665_GPIO_CTRL_1,
+                                           mask1, 0);
                if (mask2)
                        snd_soc_update_bits(codec, RT5665_GPIO_CTRL_2,
                                            mask2, 0);