From e286a5c86f89bde306df61e950acec4921071f17 Mon Sep 17 00:00:00 2001 From: Sergei Shtylylov Date: Tue, 3 Oct 2006 01:14:14 -0700 Subject: [PATCH] --- yaml --- r: 38025 b: refs/heads/master c: dc844e05913b84d09e86d88c0f861ef0afbee2fd h: refs/heads/master i: 38023: 1527686db2ce3ad4761b05e3c073bc6ed191195e v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-dma.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 88d64ad9aaa8..6c0afc6f5d78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 020e322de3ff75d32daa58e431aad07071da27c6 +refs/heads/master: dc844e05913b84d09e86d88c0f861ef0afbee2fd diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c index 9937fa7da546..22ef73eb1f68 100644 --- a/trunk/drivers/ide/ide-dma.c +++ b/trunk/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; }