patch-2.3.10 linux/drivers/block/ide-disk.c

Next file: linux/drivers/block/ide-dma.c
Previous file: linux/drivers/block/ida_ioctl.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.9/linux/drivers/block/ide-disk.c linux/drivers/block/ide-disk.c
@@ -776,8 +776,9 @@
 			drive->bios_cyl, drive->bios_head, drive->bios_sect);
 
 	if (drive->using_dma) {
-		if  ((id->field_valid & 4) && (id->word93 & 0x2000) &&
-		     (id->dma_ultra & (id->dma_ultra >> 11) & 3)) {
+		if ((id->field_valid & 4) && (id->word93 & 0x2000) &&
+		    (HWIF(drive)->udma_four) &&
+		    (id->dma_ultra & (id->dma_ultra >> 11) & 3)) {
 			printk(", UDMA(66)");	/* UDMA BIOS-enabled! */
 		} else if ((id->field_valid & 4) &&
 			   (id->dma_ultra & (id->dma_ultra >> 8) & 7)) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)