Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[mirror_ubuntu-artful-kernel.git] / sound / ppc / awacs.c

diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 09da7b52bc2e6deba601d876a9578cfbb485b768..1468e4b7bf934fac19e04bd6b0aef6b5536e0589 100644 (file)
--- 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),