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/sgiioc4.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/sgiioc4.c')
-rw-r--r-- | drivers/ide/sgiioc4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c index 44df0c750bab..457a762a1f29 100644 --- a/drivers/ide/sgiioc4.c +++ b/drivers/ide/sgiioc4.c | |||
@@ -259,7 +259,6 @@ static int sgiioc4_dma_end(ide_drive_t *drive) | |||
259 | } | 259 | } |
260 | 260 | ||
261 | drive->waiting_for_dma = 0; | 261 | drive->waiting_for_dma = 0; |
262 | ide_destroy_dmatable(drive); | ||
263 | 262 | ||
264 | return dma_stat; | 263 | return dma_stat; |
265 | } | 264 | } |
@@ -284,6 +283,7 @@ static void | |||
284 | sgiioc4_resetproc(ide_drive_t * drive) | 283 | sgiioc4_resetproc(ide_drive_t * drive) |
285 | { | 284 | { |
286 | sgiioc4_dma_end(drive); | 285 | sgiioc4_dma_end(drive); |
286 | ide_destroy_dmatable(drive); | ||
287 | sgiioc4_clearirq(drive); | 287 | sgiioc4_clearirq(drive); |
288 | } | 288 | } |
289 | 289 | ||