--- drivers/ide/ide-probe.c.orig	Mon Dec 11 14:59:08 2000
+++ drivers/ide/ide-probe.c	Mon Dec 11 15:00:13 2000
@@ -161,8 +161,8 @@
 	 * Prevent long system lockup probing later for non-existant
 	 * slave drive if the hwif is actually a flash memory card of some variety:
 	 */
-	if (drive_is_flashcard(drive)) {
-		ide_drive_t *mate = &HWIF(drive)->drives[1^drive->select.b.unit];
+	if (!drive->select.b.unit && drive_is_flashcard(drive)) {
+		ide_drive_t *mate = &HWIF(drive)->drives[1];
 		if (!mate->ata_flash) {
 			mate->present = 0;
 			mate->noprobe = 1;