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

Next file: linux-2.4.27/drivers/ide/pci/hpt366.c
Previous file: linux-2.4.27/drivers/ide/pci/generic.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.26/drivers/ide/pci/hpt34x.c linux-2.4.27/drivers/ide/pci/hpt34x.c
@@ -216,17 +216,19 @@
 		} else {
 			goto fast_ata_pio;
 		}
+#ifndef CONFIG_HPT34X_AUTODMA
+		return hwif->ide_dma_off_quietly(drive);
+#else
+		return hwif->ide_dma_on(drive);
+#endif
 	} else if ((id->capability & 8) || (id->field_valid & 2)) {
 fast_ata_pio:
 no_dma_set:
 		hpt34x_tune_drive(drive, 255);
 		return hwif->ide_dma_off_quietly(drive);
 	}
-
-#ifndef CONFIG_HPT34X_AUTODMA
-	return hwif->ide_dma_off_quietly(drive);
-#endif /* CONFIG_HPT34X_AUTODMA */
-	return hwif->ide_dma_on(drive);
+	/* IORDY not supported */
+	return 0;
 }
 
 /*

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