1 files changed, 10 insertions, 9 deletions

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index 6994f90bb83a..7cc831ccd0cb 100644
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -802,21 +802,22 @@ int __devinit snd_emu10k1_mixer(emu10k1_t *emu,
                         .read = snd_emu10k1_ac97_read,
                 };
 
-                if ((err = snd_ac97_bus(emu->card, 0, &ops, NULL, &pbus)) < 0) {
-                        if (emu->card_capabilities->ac97_chip == 1)
-                                return err;
-                        snd_printd(KERN_INFO "emu10k1: AC97 is optional on this board\n");
-                        snd_printd(KERN_INFO"          Proceeding without ac97 mixers...\n");
-                        goto no_ac97; /* FIXME: get rid of ugly gotos.. */
-                }
+                if ((err = snd_ac97_bus(emu->card, 0, &ops, NULL, &pbus)) < 0)
+                        return err;
                 pbus->no_vra = 1; /* we don't need VRA */
                 
                 memset(&ac97, 0, sizeof(ac97));
                 ac97.private_data = emu;
                 ac97.private_free = snd_emu10k1_mixer_free_ac97;
                 ac97.scaps = AC97_SCAP_NO_SPDIF;
-                if ((err = snd_ac97_mixer(pbus, &ac97, &emu->ac97)) < 0)
-                        return err;
+                if ((err = snd_ac97_mixer(pbus, &ac97, &emu->ac97)) < 0) {
+                        if (emu->card_capabilities->ac97_chip == 1)
+                                return err;
+                        snd_printd(KERN_INFO "emu10k1: AC97 is optional on this board\n");
+                        snd_printd(KERN_INFO"          Proceeding without ac97 mixers...\n");
+                        snd_device_free(emu->card, pbus);
+                        goto no_ac97; /* FIXME: get rid of ugly gotos.. */
+                }
                 if (emu->audigy) {
                         /* set master volume to 0 dB */
                         snd_ac97_write(emu->ac97, AC97_MASTER, 0x0000);