git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/misc' into for-linus
[safe/jmp/linux-2.6]
/
sound
/
pci
/
nm256
/
nm256.c
diff --git
a/sound/pci/nm256/nm256.c
b/sound/pci/nm256/nm256.c
index
50c9f8a
..
522a040
100644
(file)
--- 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: