patch-2.3.43 linux/drivers/cdrom/mcd.c

• Lines: 23
• Date: Tue Feb 8 12:01:59 2000
• Orig file: v2.3.42/linux/drivers/cdrom/mcd.c
• Orig date: Tue Dec 14 01:27:23 1999

diff -u --recursive --new-file v2.3.42/linux/drivers/cdrom/mcd.c linux/drivers/cdrom/mcd.c
@@ -1247,18 +1247,13 @@
 
         if (result[1] == 'D') 
 	{
-		sprintf(msg, " mcd: Mitsumi Double Speed CD-ROM at port=0x%x,"
-			     " irq=%d\n", mcd_port, mcd_irq);
 		MCMD_DATA_READ = MCMD_2X_READ;
-
-		mcd_info.speed = 2;
 		/* Added flag to drop to 1x speed if too many errors */
 		mcdDouble = 1;
-        } else {
-		sprintf(msg, " mcd: Mitsumi Single Speed CD-ROM at port=0x%x,"
-			     " irq=%d\n", mcd_port, mcd_irq);
-		mcd_info.speed = 2;
-	}
+        } else 
+		mcd_info.speed = 1;
+	sprintf(msg, " mcd: Mitsumi %s Speed CD-ROM at port=0x%x,"
+		     " irq=%d\n", mcd_info.speed == 1 ?  "Single" : "Double", mcd_port, mcd_irq);
 
 	request_region(mcd_port, 4, "mcd");