patch-2.2.15 linux/drivers/pnp/parport_probe.c

• Lines: 37
• Date: Fri Apr 21 12:46:24 2000
• Orig file: v2.2.14/drivers/pnp/parport_probe.c
• Orig date: Wed Jan 20 21:29:18 1999

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/pnp/parport_probe.c linux/drivers/pnp/parport_probe.c
@@ -96,6 +96,7 @@
 	struct pardevice *dev = parport_register_device(port, "IEEE 1284 probe", NULL, NULL, NULL, 0, &dev);
 
 	int result = 0;
+	int lives = 1;
 
 	if (!dev) {
 		printk("%s: unable to register for probe.\n", port->name);
@@ -104,6 +105,7 @@
 
 	parport_claim_or_block(dev);
 
+ try_again:
 	switch (parport_ieee1284_nibble_mode_ok(port, 4)) {
 	case 2:
 		current->state=TASK_INTERRUPTIBLE;
@@ -115,6 +117,20 @@
 		result = -EIO;
 		break;
 	}
+
+	if (result < 1 && lives--) {
+		/* Reset the peripherals and try again. */
+		parport_pc_write_control(port, 0x8);
+		parport_pc_write_data(port, 0);
+		udelay (50);
+		parport_pc_write_control(port, 0xc);
+		udelay (500);
+		goto try_again;
+	}
+
+	printk (KERN_DEBUG "parport_probe: %s%s\n",
+		lives ? "" : "after reset: ",
+		result < 1 ? "failed" : "succeeded");
 
 	parport_release(dev);
 	parport_unregister_device(dev);