Commit 1eaba3f2 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] wf_midi check_region() removal

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4cefaa3e
...@@ -784,7 +784,7 @@ virtual_midi_disable (void) ...@@ -784,7 +784,7 @@ virtual_midi_disable (void)
int __init detect_wf_mpu (int irq, int io_base) int __init detect_wf_mpu (int irq, int io_base)
{ {
if (check_region (io_base, 2)) { if (!request_region(io_base, 2, "wavefront midi")) {
printk (KERN_WARNING "WF-MPU: I/O port %x already in use.\n", printk (KERN_WARNING "WF-MPU: I/O port %x already in use.\n",
io_base); io_base);
return -1; return -1;
...@@ -803,11 +803,10 @@ int __init install_wf_mpu (void) ...@@ -803,11 +803,10 @@ int __init install_wf_mpu (void)
if ((phys_dev->devno = sound_alloc_mididev()) < 0){ if ((phys_dev->devno = sound_alloc_mididev()) < 0){
printk (KERN_ERR "WF-MPU: Too many MIDI devices detected.\n"); printk (KERN_ERR "WF-MPU: Too many MIDI devices detected.\n");
release_region(phys_dev->base, 2);
return -1; return -1;
} }
request_region (phys_dev->base, 2, "wavefront midi");
phys_dev->isvirtual = 0; phys_dev->isvirtual = 0;
if (config_wf_mpu (phys_dev)) { if (config_wf_mpu (phys_dev)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment