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
nfsd4: simplify references to nfsd4 lease time
[safe/jmp/linux-2.6]
/
sound
/
pci
/
cs4281.c
diff --git
a/sound/pci/cs4281.c
b/sound/pci/cs4281.c
index
415e88f
..
e2e0359
100644
(file)
--- a/
sound/pci/cs4281.c
+++ b/
sound/pci/cs4281.c
@@
-495,7
+495,7
@@
struct cs4281 {
static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
static struct pci_device_id snd_cs4281_ids[] = {
static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
static struct pci_device_id snd_cs4281_ids[] = {
- {
0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
/* CS4281 */
+ {
PCI_VDEVICE(CIRRUS, 0x6005), 0, },
/* CS4281 */
{ 0, }
};
{ 0, }
};
@@
-1929,9
+1929,9
@@
static int __devinit snd_cs4281_probe(struct pci_dev *pci,
return -ENOENT;
}
return -ENOENT;
}
-
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0
);
- if (
card == NULL
)
- return
-ENOMEM
;
+
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card
);
+ if (
err < 0
)
+ return
err
;
if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) {
snd_card_free(card);
if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) {
snd_card_free(card);