ide-scsi: fix handling of DMA errors in idescsi_pc_intr()
Check return value of ->dma_end method and if there was a DMA error handle it accordingly (set PC_FLAG_DMA_ERROR pc flag, don't update pc->xferred and increase rq->errors). Also move debug message in the right place while at it. Cc: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
e8e25f03e1
commit
c04bbc812b
|
@ -388,11 +388,13 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
|
|||
return ide_stopped;
|
||||
}
|
||||
if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
|
||||
if (hwif->dma_ops->dma_end(drive))
|
||||
pc->flags |= PC_FLAG_DMA_ERROR;
|
||||
else
|
||||
pc->xferred = pc->req_xfer;
|
||||
#if IDESCSI_DEBUG_LOG
|
||||
printk ("ide-scsi: %s: DMA complete\n", drive->name);
|
||||
#endif /* IDESCSI_DEBUG_LOG */
|
||||
pc->xferred = pc->req_xfer;
|
||||
(void)hwif->dma_ops->dma_end(drive);
|
||||
}
|
||||
|
||||
/* Clear the interrupt */
|
||||
|
@ -405,7 +407,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
|
|||
" transferred\n", pc->xferred);
|
||||
pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS;
|
||||
local_irq_enable_in_hardirq();
|
||||
if (stat & ERR_STAT)
|
||||
if ((stat & ERR_STAT) || (pc->flags & PC_FLAG_DMA_ERROR))
|
||||
rq->errors++;
|
||||
idescsi_end_request (drive, 1, 0);
|
||||
return ide_stopped;
|
||||
|
|
Loading…
Reference in New Issue