[PATCH] IDE: always release DMA engine

Release the DMA engine for the custom mapping IDE drivers also (for
example, siimage.c does allocate it in both I/O-mapped and custom-mapped
modes).  Remove useless code from the error path of
ide_allocate_dma_engine().

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 9937fa7da54..22ef73eb1f6 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -809,15 +809,14 @@ static int ide_release_iomio_dma(ide_hwif_t *hwif)
 /*
  * Needed for allowing full modular support of ide-driver
  */
-int ide_release_dma (ide_hwif_t *hwif)
+int ide_release_dma(ide_hwif_t *hwif)
 {
+        ide_release_dma_engine(hwif);
+
         if (hwif->mmio == 2)
                 return 1;
-        if (hwif->chipset == ide_etrax100)
-                return 1;
-
-        ide_release_dma_engine(hwif);
-        return ide_release_iomio_dma(hwif);
+        else
+                return ide_release_iomio_dma(hwif);
 }
 
 static int ide_allocate_dma_engine(ide_hwif_t *hwif)
@@ -829,10 +828,9 @@ static int ide_allocate_dma_engine(ide_hwif_t *hwif)
         if (hwif->dmatable_cpu)
                 return 0;
 
-        printk(KERN_ERR "%s: -- Error, unable to allocate%s DMA table(s).\n",
-                        hwif->cds->name, !hwif->dmatable_cpu ? " CPU" : "");
+        printk(KERN_ERR "%s: -- Error, unable to allocate DMA table.\n",
+               hwif->cds->name);
 
-        ide_release_dma_engine(hwif);
         return 1;
 }