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

• Lines: 30
• Date: Tue Sep 30 08:46:52 1997
• Orig file: v2.1.62/linux/drivers/sound/maui.c
• Orig date: Wed Sep 24 20:05:47 1997

diff -u --recursive --new-file v2.1.62/linux/drivers/sound/maui.c linux/drivers/sound/maui.c
@@ -18,7 +18,7 @@
 
 #include "sound_config.h"
 
-#if defined(CONFIG_MAUI)
+#ifdef CONFIG_MAUI
 
 static int      maui_base = 0x330;
 
@@ -95,8 +95,8 @@
 	      maui_sleep_flag.opts |= WK_TIMEOUT;
 	  }
 	maui_sleep_flag.opts &= ~WK_SLEEP;
-      }
-      if (signal_pending(current))
+      };
+      if ((current->signal & ~current->blocked))
 	{
 	  return 0;
 	}
@@ -321,8 +321,7 @@
 
   if (count < header.len)
     {
-      printk ("Maui warning: Host command record too short (%d<%d)\n",
-	      count, (int) header.len);
+      printk ("Maui warning: Host command record too short (%d<%d)\n", count, (int) header.len);
       header.len = count;
     }