patch-2.3.99-pre9 linux/drivers/char/lp.c

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

diff -u --recursive --new-file v2.3.99-pre8/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -146,13 +146,6 @@
 
 static unsigned int lp_count = 0;
 
-/* Test if printer is ready */
-#define	LP_READY(status)	((status) & LP_PBUSY)
-/* Test if the printer is not acking the strobe */
-#define	LP_NO_ACKING(status)	((status) & LP_PACK)
-/* Test if the printer has error conditions */
-#define LP_NO_ERROR(status)	((status) & LP_PERRORP)
-
 #undef LP_DEBUG
 
 /* --- low-level port access ----------------------------------- */
@@ -265,6 +258,7 @@
 	parport_set_timeout (lp_table[minor].dev,
 			     lp_table[minor].timeout);
 
+	if ((retv = lp_check_status (minor)) == 0)
 	do {
 		/* Write the data. */
 		written = parport_write (port, kbuf, copy_size);

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