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

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

diff -u --recursive --new-file v2.1.125/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -543,7 +543,7 @@
 
 		if (( i & 1) != 0) {
 			Byte= (Byte | z<<4);
-			if (put_user(Byte, (char *)temp))
+			if (__put_user(Byte, (char *)temp))
 				return -EFAULT;
 			temp++;
 		} else Byte=z;
@@ -768,7 +768,7 @@
 	lp_table[nr].dev = parport_register_device(port, "lp", 
 						   lp_preempt, NULL,
 						   lp_interrupt, 
-						   PARPORT_DEV_TRAN,
+						   0,
 						   (void *) &lp_table[nr]);
 	if (lp_table[nr].dev == NULL)
 		return 1;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov