From e0affbd4990f165ad2fcc0b2d6c1732f91c4ed44 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sun, 30 Oct 2005 02:15:08 -0500 Subject: [PATCH] --- yaml --- r: 29337 b: refs/heads/master c: 94ec1ef1cf29e137e5c79372e432b040c6604be6 h: refs/heads/master i: 29335: 4ceda94efac7ba5db9a16036b9ea3ec4c521a0f5 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/pdc_adma.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 03327fe78da2..2eee2be767e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 +refs/heads/master: 94ec1ef1cf29e137e5c79372e432b040c6604be6 diff --git a/trunk/drivers/scsi/pdc_adma.c b/trunk/drivers/scsi/pdc_adma.c index 309b205820a4..6a9d0dc085c1 100644 --- a/trunk/drivers/scsi/pdc_adma.c +++ b/trunk/drivers/scsi/pdc_adma.c @@ -457,13 +457,13 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set) continue; handled = 1; adma_enter_reg_mode(ap); - if (ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR)) + if (ap->flags & ATA_FLAG_PORT_DISABLED) continue; pp = ap->private_data; if (!pp || pp->state != adma_state_pkt) continue; qc = ata_qc_from_tag(ap, ap->active_tag); - if (qc && (!(qc->tf.ctl & ATA_NIEN))) { + if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) { if ((status & (aPERR | aPSD | aUIRQ))) drv_stat = ATA_ERR; else if (pp->pkt[0] != cDONE)