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_promise.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_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index e9d61bc2b247..bb000438cb6c 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -76,7 +76,8 @@ enum { PDC_RESET = (1 << 11), /* HDMA reset */ PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST | - ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI, + ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI | + ATA_FLAG_PIO_POLLING, }; @@ -534,11 +535,11 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r ap = host_set->ports[i]; tmp = mask & (1 << (i + 1)); if (tmp && ap && - !(ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR))) { + !(ap->flags & ATA_FLAG_DISABLED)) { struct ata_queued_cmd *qc; qc = ata_qc_from_tag(ap, ap->active_tag); - if (qc && (!(qc->tf.ctl & ATA_NIEN))) + if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) handled += pdc_host_intr(ap, qc); } } |