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

• Lines: 15
• Date: Mon Nov 3 09:31:00 1997
• Orig file: v2.1.61/linux/drivers/block/ide-probe.c
• Orig date: Mon Oct 20 10:36:52 1997

diff -u --recursive --new-file v2.1.61/linux/drivers/block/ide-probe.c linux/drivers/block/ide-probe.c
@@ -123,11 +123,12 @@
 #endif /* CONFIG_BLK_DEV_PROMISE */
 		switch (type) {
 			case ide_floppy:
-				if (strstr (id->model, "oppy") || strstr (id->model, "poyp")) {
+				if (!strstr(id->model, "oppy") && !strstr(id->model, "poyp") && !strstr(id->model, "ZIP"))
+					printk("cdrom or floppy?, assuming ");
+				if (drive->media != ide_cdrom) {
 					printk ("FLOPPY");
 					break;
 				}
-				printk ("cdrom or floppy?, assuming ");
 				type = ide_cdrom;	/* Early cdrom models used zero */
 			case ide_cdrom:
 				printk ("CDROM");