summaryrefslogtreecommitdiff
path: root/sound/pci/nm256/nm256.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:14 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:14 +0100
commita5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch)
tree1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/pci/nm256/nm256.c
parent6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/pci/nm256/nm256.c')
-rw-r--r--sound/pci/nm256/nm256.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 50c9f8a05082..522a040855d4 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: