Check sb0 configured in probe routine first

Pass configured irq back to isa

1 files changed, 10 insertions, 2 deletions

diff --git a/sys/i386/isa/sound/sb16_midi.c b/sys/i386/isa/sound/sb16_midi.c
index 27955b2..3db8d8a 100644
--- a/sys/i386/isa/sound/sb16_midi.c
+++ b/sys/i386/isa/sound/sb16_midi.c
@@ -294,8 +294,15 @@ reset_sb16midi (void)
 int
 probe_sb16midi (struct address_info *hw_config)
 {
+  struct address_info *sb_config;
   int             ok = 0;
 
+  if (!(sb_config = sound_getconf (SNDCARD_SB)))
+    {
+      printk ("SB16 Error: Plain SB not configured\n");
+      return 0;
+    }
+
   if (sbc_major < 4)
     return 0;			/* Not a SB16 */
 
@@ -307,9 +314,10 @@ probe_sb16midi (struct address_info *hw_config)
   ok = reset_sb16midi ();
 
   sb16midi_detected = ok;
-  if (ok)
+  if (ok) {
+    hw_config->irq = sb_config->irq;
     return 2;
-  else
+  } else
     return 0;
 }