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

• Lines: 19
• Date: Wed Dec 3 10:43:31 1997
• Orig file: v2.1.70/linux/drivers/block/ide-probe.c
• Orig date: Mon Dec 1 12:04:12 1997

diff -u --recursive --new-file v2.1.70/linux/drivers/block/ide-probe.c linux/drivers/block/ide-probe.c
@@ -123,11 +123,13 @@
 #endif /* CONFIG_BLK_DEV_PDC4030 */
 		switch (type) {
 			case ide_floppy:
-				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;
+				if (!strstr(id->model, "CD-ROM")) {
+					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;
+					}
 				}
 				type = ide_cdrom;	/* Early cdrom models used zero */
 			case ide_cdrom: