Merge branch 'master' into next

diff --git a/fade.c b/fade.c
index 44904ac54088124f695a63bb62a7e49867442f78..f95ef4c843588fa821c0a07fc090d24b88f220b8 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -107,7 +107,7 @@ static int open_and_set_mixer_channel(int volume)
 
 static void fixup_mixer_channel_arg(void)
 {
-       int val;
+       int val = SOUND_MIXER_VOLUME; /* STFU, gcc */
 
        switch (conf.mixer_channel_arg) {
                case mixer_channel_arg_volume: val = SOUND_MIXER_VOLUME; break;