patch-1.3.15 linux/drivers/char/lp.c

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

diff -u --recursive --new-file v1.3.14/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -157,7 +157,7 @@
 	wake_up(&lp->lp_wait_q);
 }
 
-static int lp_write_interrupt(struct inode * inode, struct file * file, char * buf, int count)
+static int lp_write_interrupt(struct inode * inode, struct file * file, const char * buf, int count)
 {
 	unsigned int minor = MINOR(inode->i_rdev);
 	unsigned long copy_size;
@@ -223,11 +223,12 @@
 }
 
 static int lp_write_polled(struct inode * inode, struct file * file,
-			   char * buf, int count)
+			   const char * buf, int count)
 {
 	int  retval;
 	unsigned int minor = MINOR(inode->i_rdev);
-	char c, *temp = buf;
+	char c;
+	const char *temp = buf;
 
 #ifdef LP_DEBUG
 	if (jiffies-lp_last_call > LP_TIME(minor)) {
@@ -296,7 +297,7 @@
 	return temp-buf;
 }
 
-static int lp_write(struct inode * inode, struct file * file, char * buf, int count)
+static int lp_write(struct inode * inode, struct file * file, const char * buf, int count)
 {
 	if (LP_IRQ(MINOR(inode->i_rdev)))
 		return lp_write_interrupt(inode, file, buf, count);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this