IDE: always release DMA engine
PATCH 1/1 IDE: always release DMA engine
Hail.
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().
WBR, Sergei
Signed-off-by Sergei Shtylyov <[email protected]>
drivers/ide/ide-dma.c +7 -9
@@ -811,15 +811,14 @@ static int ide_release_iomio_dma(ide_hwi/* * 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)
@@ -831,10 +830,9 @@ static int ide_allocate_dma_engine(ide_hif (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 ; }