diff options
Diffstat (limited to 'drivers/scsi/pdc_adma.c')
-rw-r--r-- | drivers/scsi/pdc_adma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c index b9a3c566f833..a341fa8d3291 100644 --- a/drivers/scsi/pdc_adma.c +++ b/drivers/scsi/pdc_adma.c | |||
@@ -455,13 +455,13 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set) | |||
455 | continue; | 455 | continue; |
456 | handled = 1; | 456 | handled = 1; |
457 | adma_enter_reg_mode(ap); | 457 | adma_enter_reg_mode(ap); |
458 | if (ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR)) | 458 | if (ap->flags & ATA_FLAG_DISABLED) |
459 | continue; | 459 | continue; |
460 | pp = ap->private_data; | 460 | pp = ap->private_data; |
461 | if (!pp || pp->state != adma_state_pkt) | 461 | if (!pp || pp->state != adma_state_pkt) |
462 | continue; | 462 | continue; |
463 | qc = ata_qc_from_tag(ap, ap->active_tag); | 463 | qc = ata_qc_from_tag(ap, ap->active_tag); |
464 | if (qc && (!(qc->tf.ctl & ATA_NIEN))) { | 464 | if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) { |
465 | if ((status & (aPERR | aPSD | aUIRQ))) | 465 | if ((status & (aPERR | aPSD | aUIRQ))) |
466 | qc->err_mask |= AC_ERR_OTHER; | 466 | qc->err_mask |= AC_ERR_OTHER; |
467 | else if (pp->pkt[0] != cDONE) | 467 | else if (pp->pkt[0] != cDONE) |
@@ -480,13 +480,13 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set) | |||
480 | for (port_no = 0; port_no < host_set->n_ports; ++port_no) { | 480 | for (port_no = 0; port_no < host_set->n_ports; ++port_no) { |
481 | struct ata_port *ap; | 481 | struct ata_port *ap; |
482 | ap = host_set->ports[port_no]; | 482 | ap = host_set->ports[port_no]; |
483 | if (ap && (!(ap->flags & (ATA_FLAG_DISABLED | ATA_FLAG_NOINTR)))) { | 483 | if (ap && (!(ap->flags & ATA_FLAG_DISABLED))) { |
484 | struct ata_queued_cmd *qc; | 484 | struct ata_queued_cmd *qc; |
485 | struct adma_port_priv *pp = ap->private_data; | 485 | struct adma_port_priv *pp = ap->private_data; |
486 | if (!pp || pp->state != adma_state_mmio) | 486 | if (!pp || pp->state != adma_state_mmio) |
487 | continue; | 487 | continue; |
488 | qc = ata_qc_from_tag(ap, ap->active_tag); | 488 | qc = ata_qc_from_tag(ap, ap->active_tag); |
489 | if (qc && (!(qc->tf.ctl & ATA_NIEN))) { | 489 | if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) { |
490 | 490 | ||
491 | /* check main status, clearing INTRQ */ | 491 | /* check main status, clearing INTRQ */ |
492 | u8 status = ata_check_status(ap); | 492 | u8 status = ata_check_status(ap); |