patch-2.4.3 linux/drivers/parport/ieee1284_ops.c

• Lines: 18
• Date: Fri Mar 2 18:43:03 2001
• Orig file: v2.4.2/linux/drivers/parport/ieee1284_ops.c
• Orig date: Mon May 15 11:16:30 2000

diff -u --recursive --new-file v2.4.2/linux/drivers/parport/ieee1284_ops.c linux/drivers/parport/ieee1284_ops.c
@@ -50,9 +50,6 @@
 	if (port->irq != PARPORT_IRQ_NONE) {
 		parport_enable_irq (port);
 		no_irq = 0;
-
-		/* Clear out previous irqs. */
-		while (!down_trylock (&port->physport->ieee1284.irq));
 	}
 
 	port->physport->ieee1284.phase = IEEE1284_PH_FWD_DATA;
@@ -192,6 +189,7 @@
 			DPRINTK (KERN_DEBUG
 				 "%s: Nibble timeout at event 9 (%d bytes)\n",
 				 port->name, i/2);
+			parport_frob_control (port, PARPORT_CONTROL_AUTOFD, 0);
 			break;
 		}