X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fide%2Fpci%2Fit821x.c;h=38f41b377ff6f322d1ba5a1276ba00d5024fd518;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=e9bad185968a8e289cd28f2844ac2578b6727373;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index e9bad1859..38f41b377 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -62,6 +62,7 @@
  *	-	Move to libata once it grows up
  */
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -498,14 +499,9 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 {
 	u8 speed	= ide_dma_speed(drive, it821x_ratemask(drive));
 
-	if (speed) {
-		config_it821x_chipset_for_pio(drive, 0);
-		it821x_tune_chipset(drive, speed);
-
-		return ide_dma_enable(drive);
-	}
-
-	return 0;
+	config_it821x_chipset_for_pio(drive, !speed);
+	it821x_tune_chipset(drive, speed);
+	return ide_dma_enable(drive);
 }
 
 /**
@@ -655,8 +651,6 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
 	}
 	ide_set_hwifdata(hwif, idev);
 
-	hwif->atapi_dma = 1;
-
 	pci_read_config_byte(hwif->pci_dev, 0x50, &conf);
 	if(conf & 1) {
 		idev->smart = 1;