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
ALSA: asihpi - Minor code cleanup
[safe/jmp/linux-2.6]
/
sound
/
drivers
/
virmidi.c
diff --git
a/sound/drivers/virmidi.c
b/sound/drivers/virmidi.c
index
f79e361
..
0e631c3
100644
(file)
--- a/
sound/drivers/virmidi.c
+++ b/
sound/drivers/virmidi.c
@@
-90,15
+90,17
@@
static int __devinit snd_virmidi_probe(struct platform_device *devptr)
int idx, err;
int dev = devptr->id;
int idx, err;
int dev = devptr->id;
-
card = snd_card_new
(index[dev], id[dev], THIS_MODULE,
-
sizeof(struct snd_card_virmidi)
);
- if (
card == NULL
)
- return
-ENOMEM
;
+
err = snd_card_create
(index[dev], id[dev], THIS_MODULE,
+
sizeof(struct snd_card_virmidi), &card
);
+ if (
err < 0
)
+ return
err
;
vmidi = (struct snd_card_virmidi *)card->private_data;
vmidi->card = card;
if (midi_devs[dev] > MAX_MIDI_DEVICES) {
vmidi = (struct snd_card_virmidi *)card->private_data;
vmidi->card = card;
if (midi_devs[dev] > MAX_MIDI_DEVICES) {
- snd_printk("too much midi devices for virmidi %d: force to use %d\n", dev, MAX_MIDI_DEVICES);
+ snd_printk(KERN_WARNING
+ "too much midi devices for virmidi %d: "
+ "force to use %d\n", dev, MAX_MIDI_DEVICES);
midi_devs[dev] = MAX_MIDI_DEVICES;
}
for (idx = 0; idx < midi_devs[dev]; idx++) {
midi_devs[dev] = MAX_MIDI_DEVICES;
}
for (idx = 0; idx < midi_devs[dev]; idx++) {