diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:20 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:20 -0400 |
commit | 4453011f959a5f5c6c7a33aea54fe17f5e43a867 (patch) | |
tree | 7ac781ab8d82b21cdf932b1736026ebe9fea757a /drivers/ide/cmd64x.c | |
parent | 1cee52de28aa687760ad262ad0834d1bf6c6d2ac (diff) |
ide: destroy DMA mappings after ending DMA (v2)
Move ide_destroy_dmatable() call out from ->dma_end method to
{ide_pc,cdrom_newpc,ide_dma}_intr(), ide_dma_timeout_retry()
and sgiioc4_resetproc().
This causes minor/safe behavior changes w.r.t.:
* cmd64x.c::cmd64{8,x}_dma_end()
* cs5536.c::cs5536_dma_end()
* icside.c::icside_dma_end()
* it821x.c::it821x_dma_end()
* scc_pata.c::__scc_dma_end()
* sl82c105.c::sl82c105_dma_end()
* tx4939ide.c::tx4939ide_dma_end()
v2:
* Fix build for CONFIG_BLK_DEV_IDEDMA=n (reported by Randy Dunlap).
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/cmd64x.c')
-rw-r--r-- | drivers/ide/cmd64x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c index f0a49d2ff711..f2edf280ef8b 100644 --- a/drivers/ide/cmd64x.c +++ b/drivers/ide/cmd64x.c | |||
@@ -327,8 +327,6 @@ static int cmd646_1_dma_end(ide_drive_t *drive) | |||
327 | outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD); | 327 | outb(dma_cmd & ~1, hwif->dma_base + ATA_DMA_CMD); |
328 | /* clear the INTR & ERROR bits */ | 328 | /* clear the INTR & ERROR bits */ |
329 | outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS); | 329 | outb(dma_stat | 6, hwif->dma_base + ATA_DMA_STATUS); |
330 | /* and free any DMA resources */ | ||
331 | ide_destroy_dmatable(drive); | ||
332 | /* verify good DMA status */ | 330 | /* verify good DMA status */ |
333 | return (dma_stat & 7) != 4; | 331 | return (dma_stat & 7) != 4; |
334 | } | 332 | } |