summaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/hpt34x.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/hpt34x.c')
-rw-r--r--drivers/ide/pci/hpt34x.c6
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)
/span> | KVM: s390: Fix access to CR6 in TPI handlerThomas Huth2013-11-281-1/+1 | * | | KVM: s390: Removed VIRTIODESCSPACEThomas Huth2013-11-281-3/+0Star | * | | KVM: s390: Removed SIE_INTERCEPT_UCONTROLThomas Huth2013-11-282-20/+6Star * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2014-01-239-10/+10 |\ \ \ \ | * | | | treewide: fix comments and printk msgsMasanari Iida2014-01-071-2/+2 | * | | | IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()Krzysztof HaƂasa2014-01-021-1/+1 | * | | | treewide: Fix typos in printkMasanari Iida2013-12-195-5/+5 | * | | | Merge branch 'master' into for-nextJiri Kosina2013-12-19