diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
| commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
| tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/pci/ali5451/ali5451.c | |
| parent | sound: virtuoso: revert "do not overwrite EEPROM on Xonar D2/D2X" (diff) | |
| parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
| download | linux-a5e0e970c06065a14844b406a0c2a59776a1ccc6.tar.xz linux-a5e0e970c06065a14844b406a0c2a59776a1ccc6.zip | |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/pci/ali5451/ali5451.c')
| -rw-r--r-- | sound/pci/ali5451/ali5451.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 1a0fd65ec280..b36c551da566 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c @@ -2307,9 +2307,9 @@ static int __devinit snd_ali_probe(struct pci_dev *pci, snd_ali_printk("probe ...\n"); - card = snd_card_new(index, id, THIS_MODULE, 0); - if (!card) - return -ENOMEM; + err = snd_card_create(index, id, THIS_MODULE, 0, &card); + if (err < 0) + return err; err = snd_ali_create(card, pci, pcm_channels, spdif, &codec); if (err < 0) |