patch-2.1.63 linux/drivers/sound/pas2_midi.c

• Lines: 28
• Date: Tue Sep 30 08:46:53 1997
• Orig file: v2.1.62/linux/drivers/sound/pas2_midi.c
• Orig date: Wed May 28 10:51:33 1997

diff -u --recursive --new-file v2.1.62/linux/drivers/sound/pas2_midi.c linux/drivers/sound/pas2_midi.c
@@ -15,7 +15,8 @@
 
 #include "sound_config.h"
 
-#if defined(CONFIG_PAS) && defined(CONFIG_MIDI)
+#ifdef CONFIG_PAS
+#ifdef CONFIG_MIDI
 
 static int      midi_busy = 0, input_opened = 0;
 static int      my_dev;
@@ -53,7 +54,10 @@
   cli ();
 
   if ((err = pas_set_intr (0x10)) < 0)
-    return err;
+    {
+      restore_flags (flags);
+      return err;
+    }
 
   /*
    * Enable input available and output FIFO empty interrupts
@@ -286,4 +290,5 @@
   pas_write (stat, 0x1B88);	/* Acknowledge interrupts */
 }
 
+#endif
 #endif