Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide-disk: workaround for buggy HPA support on ST340823A (take 3)
  hpt34x: fix CONFIG_HPT34X_AUTODMA=n handling
  triflex: add missing ->dma_base check
  pdc202xx_old: add missing ->dma_base check
  pdc202xx_new: add missing ->dma_base check
  cs5530: add missing ->dma_base check
  ide: ide_config_drive_speed() bugfixes
  ide: add cable detection for early UDMA66 devices (take 3)
  ide-pmac: fix drive->init_speed reporting
  ide: config_drive_for_dma() fixes
  ide-cris: fix ->set_pio_mode method to set transfer mode on the device
  ide: fix hidden dependencies on CONFIG_IDE_GENERIC
  ide: make CONFIG_IDE_GENERIC default to N

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 19778c5fe711..cb8fe5643d3b 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -89,11 +89,7 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
         drive->init_speed = 0;
 
         if (ide_tune_dma(drive))
-#ifndef CONFIG_HPT34X_AUTODMA
                 return -1;
-#else
-                return 0;
-#endif
 
         if (ide_use_fast_pio(drive))
                 hpt34x_tune_drive(drive, 255);
@@ -160,9 +156,11 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif)
         if (!hwif->dma_base)
                 return;
 
+#ifdef CONFIG_HPT34X_AUTODMA
         hwif->ultra_mask = 0x07;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
+#endif
 
         hwif->ide_dma_check = &hpt34x_config_drive_xfer_rate;
         if (!noautodma)