patch-2.4.0-test10 linux/drivers/ide/ide-features.c

• Lines: 19
• Date: Mon Oct 16 12:21:40 2000
• Orig file: v2.4.0-test9/linux/drivers/ide/ide-features.c
• Orig date: Thu Aug 3 16:07:42 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/ide/ide-features.c linux/drivers/ide/ide-features.c
@@ -224,7 +224,8 @@
 #ifndef CONFIG_IDEDMA_IVB
 		if ((drive->id->hw_config & 0x6000) == 0) {
 #else /* !CONFIG_IDEDMA_IVB */
-		if ((drive->id->hw_config & 0x2000) == 0) {
+		if (((drive->id->hw_config & 0x2000) == 0) ||
+		    ((drive->id->hw_config & 0x4000) == 0)) {
 #endif /* CONFIG_IDEDMA_IVB */
 			printk("%s: Speed warnings UDMA 3/4/5 is not functional.\n", drive->name);
 			return 1;
@@ -260,7 +261,7 @@
 #ifndef CONFIG_IDEDMA_IVB
 			(drive->id->hw_config & 0x4000) &&
 #endif /* CONFIG_IDEDMA_IVB */
-			(drive->id->hw_config & 0x2000)) ? 1 : 0);
+			(drive->id->hw_config & 0x6000)) ? 1 : 0);
 }
 
 /*