patch-2.2.4 linux/drivers/misc/parport_ieee1284.c

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

diff -u --recursive --new-file v2.2.3/linux/drivers/misc/parport_ieee1284.c linux/drivers/misc/parport_ieee1284.c
@@ -69,5 +69,6 @@
 		& ~1) & ~2);
 	udelay(1);
 	/* Data available? */
-	return (parport_wait_peripheral(port, 0x20, 0))?1:2;
+	parport_wait_peripheral (port, PARPORT_STATUS_ACK, PARPORT_STATUS_ACK);
+	return (parport_read_status(port) & PARPORT_STATUS_ERROR)?1:2;
 }

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