patch-2.3.30 linux/drivers/char/pc110pad.c

• Lines: 36
• Date: Fri Dec 3 10:55:09 1999
• Orig file: v2.3.29/linux/drivers/char/pc110pad.c
• Orig date: Mon Oct 11 15:38:14 1999

diff -u --recursive --new-file v2.3.29/linux/drivers/char/pc110pad.c linux/drivers/char/pc110pad.c
@@ -53,7 +53,7 @@
 static wait_queue_head_t queue;
 static struct fasync_struct *asyncptr;
 static int active=0;	/* number of concurrent open()s */
-static struct semaphore read_lock;
+static struct semaphore reader_lock;
 
 /*
  * Utility to reset a timer to go off some time in the future.
@@ -561,7 +561,7 @@
 {
 	int r;
 
-	down(&read_lock);
+	down(&reader_lock);
 	for(r=0; r<count; r++)
 	{
 		if(!read_byte_count)
@@ -573,7 +573,7 @@
 		}
 		read_byte_count = (read_byte_count+1)%3;
 	}
-	up(&read_lock);
+	up(&reader_lock);
 	return r;
 }
 
@@ -691,7 +691,7 @@
 
 int init_module(void)
 {
-	init_MUTEX(&read_lock);
+	init_MUTEX(&reader_lock);
 	return pc110pad_init();
 }