From 1fc132b79a2553f01804878eb3a3f8162d003d83 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: 93651 b: refs/heads/master c:
 23658f8af3dbba53ae9796e4c37c2fdd0272662e h: refs/heads/master i:   93649:
 30ead61141cd84dde8e3befdeea25ea44420c4e8   93647:
 8c6a6c043e00f8dec186cb48082ef232600792f0 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ide/pci/alim15x3.c | 1 -
 trunk/drivers/ide/pci/hpt366.c   | 2 --
 trunk/drivers/ide/setup-pci.c    | 7 +++----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 80988c70d542..915ed3c34bc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d36b95fe2cc5655e96da42eaf19f1aa341c6856
+refs/heads/master: 23658f8af3dbba53ae9796e4c37c2fdd0272662e
diff --git a/trunk/drivers/ide/pci/alim15x3.c b/trunk/drivers/ide/pci/alim15x3.c
index fcd0222ca477..fbb55fa2d067 100644
--- a/trunk/drivers/ide/pci/alim15x3.c
+++ b/trunk/drivers/ide/pci/alim15x3.c
@@ -734,7 +734,6 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
 {
 	if (!hwif->channel)
 		outb(inb(dmabase + 2) & 0x60, dmabase + 2);
-	ide_setup_dma(hwif, dmabase);
 }
 
 static const struct ide_port_ops ali_port_ops = {
diff --git a/trunk/drivers/ide/pci/hpt366.c b/trunk/drivers/ide/pci/hpt366.c
index 0f313f54fc27..df45098157f6 100644
--- a/trunk/drivers/ide/pci/hpt366.c
+++ b/trunk/drivers/ide/pci/hpt366.c
@@ -1348,8 +1348,6 @@ static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase)
 		outb(dma_new, dmabase + 2);
 
 	local_irq_restore(flags);
-
-	ide_setup_dma(hwif, dmabase);
 }
 
 static void __devinit hpt374_init(struct pci_dev *dev, struct pci_dev *dev2)
diff --git a/trunk/drivers/ide/setup-pci.c b/trunk/drivers/ide/setup-pci.c
index 26997648bf00..f8fc9727da07 100644
--- a/trunk/drivers/ide/setup-pci.c
+++ b/trunk/drivers/ide/setup-pci.c
@@ -361,11 +361,10 @@ void ide_hwif_setup_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
 			}
 		}
 		if (dma_base) {
-			if (d->init_dma) {
+			if (d->init_dma)
 				d->init_dma(hwif, dma_base);
-			} else {
-				ide_setup_dma(hwif, dma_base);
-			}
+
+			ide_setup_dma(hwif, dma_base);
 		} else {
 			printk(KERN_INFO "%s: %s Bus-Master DMA disabled "
 				"(BIOS)\n", hwif->name, d->name);