ide-scsi: fix DRQ checking for DMA transfers in idescsi_pc_intr()

If DRQ bit of Status Register is not cleared it is an error condition
and should be handled accordingly (disable DMA + reset the device).

Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 2553ef4d5a9106fec5be81a4770897bc6b75747d..e67cf8aa94623ad27caad82666b141595a4d3907 100644 (file)
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -388,7 +388,6 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                return ide_stopped;
        }
        if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
-               pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS;
 #if IDESCSI_DEBUG_LOG
                printk ("ide-scsi: %s: DMA complete\n", drive->name);
 #endif /* IDESCSI_DEBUG_LOG */
@@ -404,12 +403,20 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
                        printk(KERN_INFO "Packet command completed, %d bytes"
                                        " transferred\n", pc->xferred);
+               pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS;
                local_irq_enable_in_hardirq();
                if (stat & ERR_STAT)
                        rq->errors++;
                idescsi_end_request (drive, 1, 0);
                return ide_stopped;
        }
+       if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
+               pc->flags &= ~PC_FLAG_DMA_IN_PROGRESS;
+               printk(KERN_ERR "%s: The device wants to issue more interrupts "
+                               "in DMA mode\n", drive->name);
+               ide_dma_off(drive);
+               return ide_do_reset(drive);
+       }
        bcount = (hwif->INB(hwif->io_ports.lbah_addr) << 8) |
                  hwif->INB(hwif->io_ports.lbam_addr);
        ireason = hwif->INB(hwif->io_ports.nsect_addr);