Commit dc844e05 authored by Sergei Shtylylov's avatar Sergei Shtylylov Committed by Linus Torvalds
Browse files

[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

Signed-off-by: default avatarSergei Shtylyov <>
Cc: Bartlomiej Zolnierkiewicz <>
Cc: Alan Cox <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 020e322d
......@@ -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)
if (hwif->mmio == 2)
return 1;
if (hwif->chipset == ide_etrax100)
return 1;
return ide_release_iomio_dma(hwif);
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",
return 1;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment