aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 4e2005071113..b430898bbcd6 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -92,6 +92,7 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive)
92 u8 stat = 0, dma_stat = 0; 92 u8 stat = 0, dma_stat = 0;
93 93
94 dma_stat = hwif->dma_ops->dma_end(drive); 94 dma_stat = hwif->dma_ops->dma_end(drive);
95 ide_destroy_dmatable(drive);
95 stat = hwif->tp_ops->read_status(hwif); 96 stat = hwif->tp_ops->read_status(hwif);
96 97
97 if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) { 98 if (OK_STAT(stat, DRIVE_READY, drive->bad_wstat | ATA_DRQ)) {
@@ -479,6 +480,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
479 if (error < 0) { 480 if (error < 0) {
480 printk(KERN_WARNING "%s: DMA timeout error\n", drive->name); 481 printk(KERN_WARNING "%s: DMA timeout error\n", drive->name);
481 (void)dma_ops->dma_end(drive); 482 (void)dma_ops->dma_end(drive);
483 ide_destroy_dmatable(drive);
482 ret = ide_error(drive, "dma timeout error", 484 ret = ide_error(drive, "dma timeout error",
483 hwif->tp_ops->read_status(hwif)); 485 hwif->tp_ops->read_status(hwif));
484 } else { 486 } else {
@@ -490,6 +492,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
490 ide_dump_status(drive, "DMA timeout", 492 ide_dump_status(drive, "DMA timeout",
491 hwif->tp_ops->read_status(hwif)); 493 hwif->tp_ops->read_status(hwif));
492 (void)dma_ops->dma_end(drive); 494 (void)dma_ops->dma_end(drive);
495 ide_destroy_dmatable(drive);
493 } 496 }
494 } 497 }
495 498