Commit f895fce3 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

ALSA: ppc/awacs: shut up maybe-uninitialized warning

commit b268c34e upstream.

The awacs sound driver produces a false-positive warning in ppc64_defconfig:

sound/ppc/awacs.c: In function 'snd_pmac_awacs_init':
include/sound/control.h:219:9: warning: 'master_vol' may be used uninitialized in this function [-Wmaybe-uninitialized]

I haven't come up with a good way to rewrite the code to avoid the
warning, so here is a bad one: I initialize the variable before
the conditionall initialization so gcc no longer has to worry about
it.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c8715795
...@@ -991,6 +991,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip) ...@@ -991,6 +991,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
if (err < 0) if (err < 0)
return err; return err;
} }
master_vol = NULL;
if (pm7500) if (pm7500)
err = build_mixers(chip, err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_awacs_mixers_pmac7500), ARRAY_SIZE(snd_pmac_awacs_mixers_pmac7500),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment