patch-2.0.6 linux/drivers/sound/sb_common.c

Next file: linux/drivers/sound/soundcard.c
Previous file: linux/drivers/scsi/qlogicfas.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.5/linux/drivers/sound/sb_common.c linux/drivers/sound/sb_common.c
@@ -642,9 +642,12 @@
 sb_dsp_init (struct address_info *hw_config)
 {
   sb_devc        *devc;
-  int             n;
   char            name[100];
 
+#ifndef NO_SB_IRQ_TEST
+  int             n;
+#endif
+
 /*
  * Check if we had detected a SB device earlier
  */
@@ -701,12 +704,13 @@
 	  }
     }
 
+#ifndef NO_SB_IRQ_TEST
   for (n = 0; n < 3 && devc->irq_ok == 0; n++)
     if (sb_dsp_command (devc, 0xf2))	/* Cause interrupt immediately */
       {
 	int             i;
 
-	for (i = 0; !devc->irq_ok && i < 10000000; i++);
+	for (i = 0; !devc->irq_ok && i < 10000; i++);
       }
 
   if (!devc->irq_ok)
@@ -719,6 +723,7 @@
     {
       DDB (printk ("IRQ test OK (IRQ%d)\n", devc->irq));
     }
+#endif
 
   request_region (hw_config->io_base, 16, "sound blaster");
 

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