From 8de2a79718df44acf1979c9b0b08b6916aa6d5a7 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 18 Oct 2005 21:27:34 -0400
Subject: [PATCH] --- yaml --- r: 29334 b: refs/heads/master c:
 be697c3f137c9ed808753bbbc5d7751c6e5303fc h: refs/heads/master 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 ffd2be3ce0e1..a3ab0f5d256c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283
+refs/heads/master: be697c3f137c9ed808753bbbc5d7751c6e5303fc
diff --git a/trunk/drivers/scsi/pdc_adma.c b/trunk/drivers/scsi/pdc_adma.c
index 53b8db4be1a9..f3ba6b447e81 100644
--- a/trunk/drivers/scsi/pdc_adma.c
+++ b/trunk/drivers/scsi/pdc_adma.c
@@ -481,13 +481,13 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set)
 	for (port_no = 0; port_no < host_set->n_ports; ++port_no) {
 		struct ata_port *ap;
 		ap = host_set->ports[port_no];
-		if (ap && (!(ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR)))) {
+		if (ap && (!(ap->flags & ATA_FLAG_PORT_DISABLED))) {
 			struct ata_queued_cmd *qc;
 			struct adma_port_priv *pp = ap->private_data;
 			if (!pp || pp->state != adma_state_mmio)
 				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))) {
 
 				/* check main status, clearing INTRQ */
 				u8 status = ata_chk_status(ap);