diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
| commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
| tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/pci/nm256/nm256.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | kernel_samsung_smdk4412-dbe36c9dd571e035078207862766963c4fc80262.zip kernel_samsung_smdk4412-dbe36c9dd571e035078207862766963c4fc80262.tar.gz kernel_samsung_smdk4412-dbe36c9dd571e035078207862766963c4fc80262.tar.bz2 | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/pci/nm256/nm256.c')
| -rw-r--r-- | sound/pci/nm256/nm256.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 50c9f8a..522a040 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -1668,9 +1668,9 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci, } } - card = snd_card_new(index, id, THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index, id, THIS_MODULE, 0, &card); + if (err < 0) + return err; switch (pci->device) { case PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO: |