patch-2.4.27 linux-2.4.27/drivers/ide/pci/hpt366.c

• Lines: 35
• Date: 2004-08-07 16:26:04.841354461 -0700
• Orig file: linux-2.4.26/drivers/ide/pci/hpt366.c
• Orig date: 2004-04-14 06:05:30.000000000 -0700

diff -urN linux-2.4.26/drivers/ide/pci/hpt366.c linux-2.4.27/drivers/ide/pci/hpt366.c
@@ -123,7 +123,7 @@
 				"                             %s\n",
 			(c0 & 0x80) ? "no" : "yes",
 			(c1 & 0x80) ? "no" : "yes");
-
+#if 0
 		if (hpt_minimum_revision(dev, 3)) {
 			u8 cbl;
 			cbl = inb(iobase + 0x7b);
@@ -136,7 +136,7 @@
 				(cbl & 0x01) ? 33 : 66);
 			p += sprintf(p, "\n");
 		}
-
+#endif
 		p += sprintf(p, "--------------- drive0 --------- drive1 "
 				"------- drive0 ---------- drive1 -------\n");
 		p += sprintf(p, "DMA capable:    %s              %s" 
@@ -567,13 +567,15 @@
 		} else {
 			goto fast_ata_pio;
 		}
+		return hwif->ide_dma_on(drive);
 	} else if ((id->capability & 8) || (id->field_valid & 2)) {
 fast_ata_pio:
 no_dma_set:
 		hpt3xx_tune_drive(drive, 5);
 		return hwif->ide_dma_off_quietly(drive);
 	}
-	return hwif->ide_dma_on(drive);
+	/* IORDY not supported */
+	return 0;
 }
 
 /*