patch-2.1.129 linux/drivers/block/ide-probe.c

• Lines: 20
• Date: Fri Nov 13 09:55:31 1998
• Orig file: v2.1.128/linux/drivers/block/ide-probe.c
• Orig date: Thu Sep 17 17:53:35 1998

diff -u --recursive --new-file v2.1.128/linux/drivers/block/ide-probe.c linux/drivers/block/ide-probe.c
@@ -78,8 +78,18 @@
 	ide_fixstring (id->serial_no, sizeof(id->serial_no), bswap);
 
 	id->model[sizeof(id->model)-1] = '\0';	/* we depend on this a lot! */
-	drive->present = 1;
 	printk("%s: %s, ", drive->name, id->model);
+	drive->present = 1;
+
+	/*
+	 * Prevent long system lockup probing later for non-existant
+	 * slave drive if the hwif is actually a Kodak CompactFlash card.
+	 */
+	if (!strcmp(id->model, "KODAK ATA_FLASH")) {
+		ide_drive_t *mate = &HWIF(drive)->drives[1^drive->select.b.unit];
+		mate->present = 0;
+		mate->noprobe = 1;
+	}
 
 	/*
 	 * Check for an ATAPI device