6 files changed, 26 insertions, 19 deletions

diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index acaf71fd4c09..e5949b1d3fb0 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cs5530.c               Version 0.73    Mar 10 2007
+ * linux/drivers/ide/pci/cs5530.c               Version 0.74    Jul 28 2007
  *
  * Copyright (C) 2000                   Andre Hedrick <andre@linux-ide.org>
  * Copyright (C) 2000                   Mark Lord <mlord@pobox.com>
@@ -207,6 +207,9 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
         struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
         unsigned long flags;
 
+        if (pci_resource_start(dev, 4) == 0)
+                return -EFAULT;
+
         dev = NULL;
         while ((dev = pci_get_device(PCI_VENDOR_ID_CYRIX, PCI_ANY_ID, dev)) != NULL) {
                 switch (dev->device) {
@@ -325,6 +328,9 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
                         /* needs autotuning later */
         }
 
+        if (hwif->dma_base == 0)
+                return;
+
         hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x07;
         hwif->mwdma_mask = 0x07;
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)
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 09941f37d635..465c935fdf25 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -187,14 +187,6 @@ static int ns87415_ide_dma_setup(ide_drive_t *drive)
         return 1;
 }
 
-static int ns87415_ide_dma_check (ide_drive_t *drive)
-{
-        if (drive->media != ide_disk)
-                return -1;
-
-        return __ide_dma_check(drive);
-}
-
 static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
 {
         struct pci_dev *dev = hwif->pci_dev;
@@ -266,7 +258,6 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
 
         outb(0x60, hwif->dma_status);
         hwif->dma_setup = &ns87415_ide_dma_setup;
-        hwif->ide_dma_check = &ns87415_ide_dma_check;
         hwif->ide_dma_end = &ns87415_ide_dma_end;
 
         if (!noautodma)
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 8a66a2871b3a..f6db2f37efad 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -378,6 +378,9 @@ static unsigned int __devinit init_chipset_pdcnew(struct pci_dev *dev, const cha
         int f, r;
         u8 pll_ctl0, pll_ctl1;
 
+        if (dma_base == 0)
+                return -EFAULT;
+
 #ifdef CONFIG_PPC_PMAC
         apple_kiwi_init(dev);
 #endif
@@ -494,15 +497,18 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
         hwif->speedproc = &pdcnew_tune_chipset;
         hwif->resetproc = &pdcnew_reset;
 
+        hwif->err_stops_fifo = 1;
+
         hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
 
+        if (hwif->dma_base == 0)
+                return;
+
         hwif->atapi_dma  = 1;
 
         hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x07;
 
-        hwif->err_stops_fifo = 1;
-
         hwif->ide_dma_check = &pdcnew_config_drive_xfer_rate;
 
         if (hwif->cbl != ATA_CBL_PATA40_SHORT)
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index fbcb0bb9c956..e19a891171cb 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/pdc202xx_old.c        Version 0.50    Mar 3, 2007
+ *  linux/drivers/ide/pci/pdc202xx_old.c        Version 0.51    Jul 27, 2007
  *
  *  Copyright (C) 1998-2002             Andre Hedrick <andre@linux-ide.org>
  *  Copyright (C) 2006-2007             MontaVista Software, Inc.
@@ -337,15 +337,18 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 
         hwif->speedproc = &pdc202xx_tune_chipset;
 
+        hwif->err_stops_fifo = 1;
+
         hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
 
+        if (hwif->dma_base == 0)
+                return;
+
         hwif->ultra_mask = hwif->cds->udma_mask;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;
         hwif->atapi_dma = 1;
 
-        hwif->err_stops_fifo = 1;
-
         hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate;
         hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
         hwif->dma_timeout = &pdc202xx_dma_timeout;
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 024bbfae0429..098692a6d615 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -115,6 +115,9 @@ static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
         hwif->tuneproc = &triflex_tune_drive;
         hwif->speedproc = &triflex_tune_chipset;
 
+        if (hwif->dma_base == 0)
+                return;
+
         hwif->atapi_dma  = 1;
         hwif->mwdma_mask = 0x07;
         hwif->swdma_mask = 0x07;