From 6914f2953aa8ecc8330d610fc345a2f6c2c40e74 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 26 Apr 2008 22:25:21 +0200
Subject: [PATCH] --- yaml --- r: 93654 b: refs/heads/master c:
 63158d5c217e2e62665ae9b10d203bd7da817108 h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/ide/arm/palm_bk3710.c |  5 ++++-
 trunk/drivers/ide/ide-dma.c         | 13 -------------
 trunk/drivers/ide/setup-pci.c       | 17 +++++++++++++----
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index f67ca89e9f45..c9a25be4efde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d54452fbf84500eff77a55a2061f4669441d2cc3
+refs/heads/master: 63158d5c217e2e62665ae9b10d203bd7da817108
diff --git a/trunk/drivers/ide/arm/palm_bk3710.c b/trunk/drivers/ide/arm/palm_bk3710.c
index 9e21b8e6099c..7ed79e7f3110 100644
--- a/trunk/drivers/ide/arm/palm_bk3710.c
+++ b/trunk/drivers/ide/arm/palm_bk3710.c
@@ -392,7 +392,10 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
 	hwif->mmio = 1;
 	default_hwif_mmiops(hwif);
 
-	ide_setup_dma(hwif, mem->start);
+	printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);
+
+	if (ide_allocate_dma_engine(hwif) == 0)
+		ide_setup_dma(hwif, mem->start);
 
 	idx[0] = i;
 
diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c
index ca7f974a71f5..366bbc841fc9 100644
--- a/trunk/drivers/ide/ide-dma.c
+++ b/trunk/drivers/ide/ide-dma.c
@@ -841,19 +841,6 @@ EXPORT_SYMBOL_GPL(ide_allocate_dma_engine);
 
 void ide_setup_dma(ide_hwif_t *hwif, unsigned long base)
 {
-	if (hwif->mmio)
-		printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);
-	else
-		printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx\n",
-				 hwif->name, base, base + 7);
-
-	hwif->extra_base = base + (hwif->channel ? 8 : 16);
-
-	if (ide_allocate_dma_engine(hwif)) {
-		ide_release_dma_engine(hwif);
-		return;
-	}
-
 	hwif->dma_base = base;
 
 	if (!hwif->dma_command)
diff --git a/trunk/drivers/ide/setup-pci.c b/trunk/drivers/ide/setup-pci.c
index bf28970b0278..5006ea98733b 100644
--- a/trunk/drivers/ide/setup-pci.c
+++ b/trunk/drivers/ide/setup-pci.c
@@ -367,15 +367,24 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
 	if ((d->host_flags & IDE_HFLAG_NO_AUTODMA) == 0 ||
 	    ((dev->class >> 8) == PCI_CLASS_STORAGE_IDE &&
 	     (dev->class & 0x80))) {
-		unsigned long dma_base = ide_get_or_set_dma_base(d, hwif);
+		unsigned long base = ide_get_or_set_dma_base(d, hwif);
 
-		if (dma_base == 0 || ide_pci_set_master(dev, d->name) < 0)
+		if (base == 0 || ide_pci_set_master(dev, d->name) < 0)
 			goto out_disabled;
 
 		if (d->init_dma)
-			d->init_dma(hwif, dma_base);
+			d->init_dma(hwif, base);
 
-		ide_setup_dma(hwif, dma_base);
+		if (hwif->mmio)
+			printk(KERN_INFO "    %s: MMIO-DMA\n", hwif->name);
+		else
+			printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx\n",
+					 hwif->name, base, base + 7);
+
+		hwif->extra_base = base + (hwif->channel ? 8 : 16);
+
+		if (ide_allocate_dma_engine(hwif) == 0)
+			ide_setup_dma(hwif, base);
 	}
 
 	return;