patch-2.3.13 linux/drivers/parport/ieee1284.c

Next file: linux/drivers/parport/ieee1284_ops.c
Previous file: linux/drivers/parport/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/drivers/parport/ieee1284.c linux/drivers/parport/ieee1284.c
@@ -310,13 +310,9 @@
 
 	/* Event 6: nAck goes high */
 	if (parport_wait_peripheral (port,
-				     PARPORT_STATUS_ACK
-				     | PARPORT_STATUS_PAPEROUT,
+				     PARPORT_STATUS_ACK,
 				     PARPORT_STATUS_ACK)) {
-		if (parport_read_status (port) & PARPORT_STATUS_ACK)
-			printk (KERN_DEBUG
-				"%s: working around buggy peripheral: tell "
-				"Tim what make it is\n", port->name);
+		/* This shouldn't really happen with a compliant device. */
 		DPRINTK (KERN_DEBUG
 			 "%s: Mode 0x%02x not supported? (0x%02x)\n",
 			 port->name, mode, port->ops->read_status (port));

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