]>
Commit | Line | Data |
---|---|---|
fd5bac8d | 1 | --- linux/sound/pci/nm256/nm256.c 27 Dec 2004 13:32:57 -0000 1.61 |
2 | +++ linux/sound/pci/nm256/nm256.c 30 Dec 2004 16:10:00 -0000 | |
3 | @@ -1486,12 +1486,6 @@ | |
4 | ||
512ee641 | 5 | snd_nm256_init_chip(chip); |
6 | ||
7 | - if ((err = snd_nm256_pcm(chip, 0)) < 0) | |
8 | - goto __error; | |
9 | - | |
10 | - if ((err = snd_nm256_mixer(chip)) < 0) | |
11 | - goto __error; | |
fd5bac8d | 12 | - |
512ee641 | 13 | // pci_set_master(pci); /* needed? */ |
14 | ||
15 | snd_card_set_pm_callback(card, nm256_suspend, nm256_resume, chip); | |
fd5bac8d | 16 | @@ -1612,6 +1606,12 @@ |
512ee641 | 17 | chip->reset_workaround = 1; |
18 | } | |
19 | ||
20 | + if ((err = snd_nm256_pcm(chip, 0)) < 0 || | |
21 | + (err = snd_nm256_mixer(chip)) < 0) { | |
22 | + snd_card_free(card); | |
23 | + return err; | |
24 | + } | |
fd5bac8d | 25 | + |
512ee641 | 26 | sprintf(card->shortname, "NeoMagic %s", card->driver); |
27 | sprintf(card->longname, "%s at 0x%lx & 0x%lx, irq %d", | |
28 | card->shortname, |