patch-2.3.10 linux/drivers/char/tpqic02.c

Next file: linux/drivers/char/tty_io.c
Previous file: linux/drivers/char/sysrq.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.9/linux/drivers/char/tpqic02.c linux/drivers/char/tpqic02.c
@@ -127,7 +127,7 @@
 
 static volatile int ctlbits = 0;     /* control reg bits for tape interface */
 
-static wait_queue_t qic02_tape_transfer; /* sync rw with interrupts */
+static wait_queue_head_t qic02_tape_transfer; /* sync rw with interrupts */
 
 static volatile struct mtget ioctl_status;	/* current generic status */
 
@@ -2216,7 +2216,7 @@
     }
     
 	/* Only one at a time from here on... */
-    if (atomic_read(&filp->f_count)>1) 	/* filp->f_count==1 for the first open() */
+    if (file_count(filp)>1) 	/* filp->f_count==1 for the first open() */
     {
 	return -EBUSY;
     }
@@ -2889,7 +2889,7 @@
     return 0;
 } /* qic02_get_resources */
 
-__initfunc(int qic02_tape_init(void))
+int __init qic02_tape_init(void)
 {
     if (TPSTATSIZE != 6)
     {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)