summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-07-04 17:07:45 +0200
committerSasha Levin <alexander.levin@verizon.com>2017-06-13 09:29:19 -0400
commit1de253cbd35be16b6b0f7d8ef6ed360159f33a1e (patch)
treed177198fd419411e40198506f23a70567afa5292 /sound
parentdb14464180fa453a8ba82bce8107884571d7db6d (diff)
ALSA: ppc/awacs: shut up maybe-uninitialized warning
[ Upstream commit b268c34e5ee92a4cc3099b0caaf26e6bfbdf0f18 ] 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: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/ppc/awacs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 09da7b52bc2e..1468e4b7bf93 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -991,6 +991,7 @@ snd_pmac_awacs_init(struct snd_pmac *chip)
if (err < 0)
return err;
}
+ master_vol = NULL;
if (pm7500)
err = build_mixers(chip,
ARRAY_SIZE(snd_pmac_awacs_mixers_pmac7500),