diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-05-15 13:59:15 +0200 |
|---|---|---|
| committer | Tejun Heo <htejun@gmail.com> | 2006-05-15 13:59:15 +0200 |
| commit | 12436c30f4808e00fa008c6787c609bc6ae216ba (patch) | |
| tree | 22ddaad8def4f4a77637a3da62a8d8f422a95c29 /drivers/scsi/sata_mv.c | |
| parent | [PATCH] sata_sil24: convert to new EH (diff) | |
| parent | Merge branch 'upstream' into irq-pio (diff) | |
| download | linux-12436c30f4808e00fa008c6787c609bc6ae216ba.tar.xz linux-12436c30f4808e00fa008c6787c609bc6ae216ba.zip | |
Merge branch 'irq-pio'
Conflicts:
drivers/scsi/libata-core.c
include/linux/libata.h
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index e8d00f0efdf2..e6d141dd0385 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c @@ -87,7 +87,7 @@ enum { MV_FLAG_IRQ_COALESCE = (1 << 29), /* IRQ coalescing capability */ MV_COMMON_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO | - ATA_FLAG_NO_ATAPI), + ATA_FLAG_PIO_POLLING), MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE, CRQB_FLAG_READ = (1 << 0), @@ -1396,7 +1396,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant, } } - if (ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR)) + if (ap && (ap->flags & ATA_FLAG_DISABLED)) continue; err_mask = ac_err_mask(ata_status); @@ -1417,7 +1417,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)) { qc->err_mask |= err_mask; ata_qc_complete(qc); } |