summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_mv.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-18 17:55:00 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-11-18 17:55:00 +0100
commitd67e7ebb2a15bf0429c55f2fc1c4b02808367874 (patch)
tree069547c95e376312fc0e7a51637a7a3c2a7c5c50 /drivers/scsi/sata_mv.c
parentMerge branch 'upstream' (diff)
downloadlinux-d67e7ebb2a15bf0429c55f2fc1c4b02808367874.tar.xz
linux-d67e7ebb2a15bf0429c55f2fc1c4b02808367874.zip
[libata sata_mv] IRQ PIO build fix
Diffstat (limited to 'drivers/scsi/sata_mv.c')
-rw-r--r--drivers/scsi/sata_mv.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 9687646d73e1..6dc2a612ccbd 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -1220,8 +1220,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
handled++;
}
- if (ap &&
- (ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR)))
+ if (ap && (ap->flags & ATA_FLAG_PORT_DISABLED))
continue;
err_mask = ac_err_mask(ata_status);
@@ -1242,7 +1241,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
VPRINTK("port %u IRQ found for qc, "
"ata_status 0x%x\n", port,ata_status);
/* mark qc status appropriately */
- if (!(qc->tf.ctl & ATA_NIEN))
+ if (!(qc->tf.flags & ATA_TFLAG_POLLING))
ata_qc_complete(qc, err_mask);
}
}