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

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

diff -u --recursive --new-file v2.1.62/linux/drivers/sound/opl3.c linux/drivers/sound/opl3.c
@@ -22,7 +22,7 @@
 
 #include "sound_config.h"
 
-#if defined(CONFIG_YM3812)
+#ifdef CONFIG_YM3812
 
 #include "opl3.h"
 
@@ -111,8 +111,8 @@
       {
 	struct sbi_instrument ins;
 
+	printk ("Warning: Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. Fix the program.\n");
 	memcpy ((char *) &ins, (&((char *) arg)[0]), sizeof (ins));
-	printk("Warning: Obsolete ioctl(SNDCTL_FM_LOAD_INSTR) used. Fix the program.\n");
 
 	if (ins.channel < 0 || ins.channel >= SBFM_MAXINSTR)
 	  {
@@ -519,9 +519,7 @@
 
   if (instr->channel < 0)
     {
-      printk (
-	       "OPL3: Initializing voice %d with undefined instrument\n",
-	       voice);
+      printk ("OPL3: Initializing voice %d with undefined instrument\n", voice);
       return 0;
     }