patch-pre2.0.10 linux/drivers/sound/pss.c

• Lines: 33
• Date: Sat Jun 1 09:41:05 1996
• Orig file: pre2.0.9/linux/drivers/sound/pss.c
• Orig date: Mon Apr 29 18:05:18 1996

diff -u --recursive --new-file pre2.0.9/linux/drivers/sound/pss.c linux/drivers/sound/pss.c
@@ -779,9 +779,9 @@
 long
 attach_pss_mpu (long mem_start, struct address_info *hw_config)
 {
+#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
   long            ret;
 
-#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
   {
     int             prev_devs;
     prev_devs = num_midis;
@@ -790,8 +790,10 @@
     if (num_midis == (prev_devs + 1))	/* The MPU driver installed itself */
       midi_devs[prev_devs]->coproc = &pss_coproc_operations;
   }
-#endif
   return ret;
+#else
+  return mem_start;
+#endif
 }
 
 int
@@ -863,7 +865,9 @@
 void
 unload_pss_mpu (struct address_info *hw_config)
 {
+#if (defined(CONFIG_MPU401) || defined(CONFIG_MPU_EMU)) && defined(CONFIG_MIDI)
   unload_mpu401 (hw_config);
+#endif
 }
 
 void