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>
This commit is contained in:
@ -259,7 +259,6 @@ static int sgiioc4_dma_end(ide_drive_t *drive)
|
||||
}
|
||||
|
||||
drive->waiting_for_dma = 0;
|
||||
ide_destroy_dmatable(drive);
|
||||
|
||||
return dma_stat;
|
||||
}
|
||||
@ -284,6 +283,7 @@ static void
|
||||
sgiioc4_resetproc(ide_drive_t * drive)
|
||||
{
|
||||
sgiioc4_dma_end(drive);
|
||||
ide_destroy_dmatable(drive);
|
||||
sgiioc4_clearirq(drive);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user