patch-2.1.117 linux/drivers/sound/wf_midi.c

Next file: linux/drivers/video/Config.in
Previous file: linux/drivers/sound/wavfront.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.116/linux/drivers/sound/wf_midi.c linux/drivers/sound/wf_midi.c
@@ -454,12 +454,12 @@
 	struct wf_mpu_config *devc;
 
 	if (dev < 0 || dev >= num_midis || midi_devs[dev]==NULL)
-		return -ENXIO;
+		return -(ENXIO);
 
 	devc = &dev_conf[dev];
 
 	if (devc->opened) {
-		return -EBUSY;
+		return -(EBUSY);
 	}
 
 	devc->mode = MODE_MIDI;
@@ -678,8 +678,8 @@
 	midi_synth_send_sysex
 };
 
-static struct synth_operations wf_mpu_synth_operations[WAVEFRONT_MAX_DEVICES*2];
-static struct midi_operations  wf_mpu_midi_operations[WAVEFRONT_MAX_DEVICES*2];
+static struct synth_operations wf_mpu_synth_operations[2];
+static struct midi_operations  wf_mpu_midi_operations[2];
 static int wfmpu_cnt = 0;
 
 static struct midi_operations wf_mpu_midi_proto =
@@ -707,9 +707,8 @@
 	struct wf_mpu_config *devc;
 	int                internal;
 
-	if (wfmpu_cnt >= WAVEFRONT_MAX_DEVICES * 2) {
-		printk (KERN_ERR "WF-MPU: eh ? more MPU devices "
-			"than cards ?!!\n");
+	if (wfmpu_cnt >= 2) {
+		printk (KERN_ERR "WF-MPU: more MPU devices than cards ?!!\n");
 		return (-1);
 	}
   

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov