ide-{floppy,scsi}: read Status Register before stopping DMA engine

Read Status Register before stopping DMA engine to match ide-tape
device driver - it should be safe and shouldn't affect anything.

This is a preparation for adding generic ide_pc_intr() helper.

Cc: Borislav Petkov <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 502ef9dcc5b9da25fcbafc3f45e1bf7439eff146..70aef97fb8bc2ad2218dd2d54ee9c018cbddc4fb 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -399,6 +399,9 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
 
        debug_log("Enter %s - interrupt handler\n", __func__);
 
+       /* Clear the interrupt */
+       stat = ide_read_status(drive);
+
        if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
                dma_error = hwif->dma_ops->dma_end(drive);
                if (dma_error) {
@@ -412,9 +415,6 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
                debug_log("%s: DMA finished\n", drive->name);
        }
 
-       /* Clear the interrupt */
-       stat = ide_read_status(drive);
-
        /* No more interrupts */
        if ((stat & DRQ_STAT) == 0) {
                debug_log("Packet command completed, %d bytes transferred\n",

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index ec9a5de2e75e8870cd2ff7f81e9b7f7730232ae4..ada733ca6725261a38d29415a1fe04a487e8c5ce 100644 (file)
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -370,6 +370,10 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                pc->callback(drive);
                return ide_stopped;
        }
+
+       /* Clear the interrupt */
+       stat = ide_read_status(drive);
+
        if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
                if (hwif->dma_ops->dma_end(drive))
                        pc->flags |= PC_FLAG_DMA_ERROR;
@@ -378,9 +382,6 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                debug_log("%s: DMA finished\n", drive->name);
        }
 
-       /* Clear the interrupt */
-       stat = ide_read_status(drive);
-
        if ((stat & DRQ_STAT) == 0) {
                /* No more interrupts */
                debug_log("Packet command completed, %d bytes transferred\n",