patch-2.3.99-pre4 linux/drivers/char/n_r3964.c

• Lines: 39
• Date: Sun Apr 2 15:38:53 2000
• Orig file: v2.3.99-pre3/linux/drivers/char/n_r3964.c
• Orig date: Tue Sep 7 12:14:06 1999

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/char/n_r3964.c linux/drivers/char/n_r3964.c
@@ -12,7 +12,10 @@
  * Author:
  * L. Haag
  *
- * $Log: r3964.c,v $
+ * $Log: n_r3964.c,v $
+ * Revision 1.8  2000/03/23 14:14:54  dwmw2
+ * Fix race in sleeping in r3964_read()
+ *
  * Revision 1.7  1999/28/08 11:41:50  dwmw2
  * Port to 2.3 kernel
  *
@@ -38,7 +41,6 @@
  *
  *
  */
-#define R3964_VERSION "1.7"
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -224,7 +226,7 @@
 {
    int status;
    
-   printk ("r3964: Philips r3964 Driver V%s\n", R3964_VERSION);
+   printk ("r3964: Philips r3964 Driver $Revision: 1.8 $\n");
 
    /*
     * Register the tty line discipline
@@ -1280,8 +1282,8 @@
          /* block until there is a message: */
          add_wait_queue(&pInfo->read_wait, &wait);
 repeat:
-         pMsg = remove_msg(pInfo, pClient);
          current->state = TASK_INTERRUPTIBLE;
+         pMsg = remove_msg(pInfo, pClient);
 	 if (!pMsg && !signal_pending(current))
 		 {
             schedule();