git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
sound
/
oss
/
wf_midi.c
diff --git
a/sound/oss/wf_midi.c
b/sound/oss/wf_midi.c
index
379e70f
..
3f3a390
100644
(file)
--- a/
sound/oss/wf_midi.c
+++ b/
sound/oss/wf_midi.c
@@
-81,7
+81,7
@@
static struct wf_mpu_config *phys_dev = &devs[0];
static struct wf_mpu_config *virt_dev = &devs[1];
static void start_uart_mode (void);
static struct wf_mpu_config *virt_dev = &devs[1];
static void start_uart_mode (void);
-static
spinlock_t lock=SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(lock)
;
#define OUTPUT_READY 0x40
#define INPUT_AVAIL 0x80
#define OUTPUT_READY 0x40
#define INPUT_AVAIL 0x80
@@
-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",
io_base);
return -1;
printk (KERN_WARNING "WF-MPU: I/O port %x already in use.\n",
io_base);
return -1;
@@
-803,11
+803,10
@@
int __init install_wf_mpu (void)
if ((phys_dev->devno = sound_alloc_mididev()) < 0){
printk (KERN_ERR "WF-MPU: Too many MIDI devices detected.\n");
if ((phys_dev->devno = sound_alloc_mididev()) < 0){
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;
if (config_wf_mpu (phys_dev)) {
phys_dev->isvirtual = 0;
if (config_wf_mpu (phys_dev)) {
@@
-821,7
+820,7
@@
int __init install_wf_mpu (void)
/* OK, now we're configured to handle an interrupt ... */
/* OK, now we're configured to handle an interrupt ... */
- if (request_irq (phys_dev->irq, wf_mpuintr,
SA_INTERRUPT|SA_SHIRQ
,
+ if (request_irq (phys_dev->irq, wf_mpuintr,
IRQF_DISABLED|IRQF_SHARED
,
"wavefront midi", phys_dev) < 0) {
printk (KERN_ERR "WF-MPU: Failed to allocate IRQ%d\n",
"wavefront midi", phys_dev) < 0) {
printk (KERN_ERR "WF-MPU: Failed to allocate IRQ%d\n",