patch-1.3.38 linux/drivers/sound/patmgr.c

• Lines: 93
• Date: Tue Nov 7 10:14:17 1995
• Orig file: v1.3.37/linux/drivers/sound/patmgr.c
• Orig date: Mon Oct 23 18:02:16 1995

diff -u --recursive --new-file v1.3.37/linux/drivers/sound/patmgr.c linux/drivers/sound/patmgr.c
@@ -63,10 +63,7 @@
     return -EBUSY;
   pmgr_opened[dev] = 1;
 
-  {
-    server_wait_flag[dev].aborting = 0;
-    server_wait_flag[dev].mode = WK_NONE;
-  };
+  server_wait_flag[dev].mode = WK_NONE;
 
   return 0;
 }
@@ -105,29 +102,27 @@
       return -EIO;
     }
 
-  while (!ok && !((current->signal & ~current->blocked)))
+  while (!ok && !(current->signal & ~current->blocked))
     {
       save_flags (flags);
       cli ();
 
       while (!(mbox[dev] && msg_direction[dev] == A_TO_S) &&
-	     !((current->signal & ~current->blocked)))
+	     !(current->signal & ~current->blocked))
 	{
 
 	  {
 	    unsigned long   tl;
 
 	    if (0)
-	      tl = current->timeout = jiffies + (0);
+	      current->timeout = tl = jiffies + (0);
 	    else
 	      tl = 0xffffffff;
 	    server_wait_flag[dev].mode = WK_SLEEP;
 	    interruptible_sleep_on (&server_procs[dev]);
 	    if (!(server_wait_flag[dev].mode & WK_WAKEUP))
 	      {
-		if (current->signal & ~current->blocked)
-		  server_wait_flag[dev].aborting = 1;
-		else if (jiffies >= tl)
+		if (jiffies >= tl)
 		  server_wait_flag[dev].mode |= WK_TIMEOUT;
 	      }
 	    server_wait_flag[dev].mode &= ~WK_SLEEP;
@@ -161,7 +156,7 @@
       return -EIO;
     }
 
-  memcpy_fromfs (mbox[dev], &((buf)[0]), 4);
+  memcpy_fromfs ((char *) mbox[dev], &((buf)[0]), 4);
 
   if (*(unsigned char *) mbox[dev] == SEQ_FULLSIZE)
     {
@@ -238,16 +233,14 @@
 	unsigned long   tl;
 
 	if (0)
-	  tl = current->timeout = jiffies + (0);
+	  current->timeout = tl = jiffies + (0);
 	else
 	  tl = 0xffffffff;
 	appl_wait_flag.mode = WK_SLEEP;
 	interruptible_sleep_on (&appl_proc);
 	if (!(appl_wait_flag.mode & WK_WAKEUP))
 	  {
-	    if (current->signal & ~current->blocked)
-	      appl_wait_flag.aborting = 1;
-	    else if (jiffies >= tl)
+	    if (jiffies >= tl)
 	      appl_wait_flag.mode |= WK_TIMEOUT;
 	  }
 	appl_wait_flag.mode &= ~WK_SLEEP;
@@ -318,16 +311,14 @@
 	unsigned long   tl;
 
 	if (0)
-	  tl = current->timeout = jiffies + (0);
+	  current->timeout = tl = jiffies + (0);
 	else
 	  tl = 0xffffffff;
 	appl_wait_flag.mode = WK_SLEEP;
 	interruptible_sleep_on (&appl_proc);
 	if (!(appl_wait_flag.mode & WK_WAKEUP))
 	  {
-	    if (current->signal & ~current->blocked)
-	      appl_wait_flag.aborting = 1;
-	    else if (jiffies >= tl)
+	    if (jiffies >= tl)
 	      appl_wait_flag.mode |= WK_TIMEOUT;
 	  }
 	appl_wait_flag.mode &= ~WK_SLEEP;