projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/misc' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
sound
/
pci
/
cs5535audio
/
cs5535audio.c
diff --git
a/sound/pci/cs5535audio/cs5535audio.c
b/sound/pci/cs5535audio/cs5535audio.c
index 826e6dec2e97cf1e834d08b4c380469cb4717c8a..c89ed1f5bc2bd5e6f29f357944de60aca751bae0 100644
(file)
--- a/
sound/pci/cs5535audio/cs5535audio.c
+++ b/
sound/pci/cs5535audio/cs5535audio.c
@@
-312,7
+312,7
@@
static int __devinit snd_cs5535audio_create(struct snd_card *card,
if (request_irq(pci->irq, snd_cs5535audio_interrupt,
IRQF_SHARED, "CS5535 Audio", cs5535au)) {
if (request_irq(pci->irq, snd_cs5535audio_interrupt,
IRQF_SHARED, "CS5535 Audio", cs5535au)) {
- snd_printk("unable to grab IRQ %d\n", pci->irq);
+ snd_printk(
KERN_ERR
"unable to grab IRQ %d\n", pci->irq);
err = -EBUSY;
goto sndfail;
}
err = -EBUSY;
goto sndfail;
}
@@
-353,9
+353,9
@@
static int __devinit snd_cs5535audio_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_cs5535audio_create(card, pci, &cs5535au)) < 0)
goto probefail_out;
if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
goto probefail_out;