Merge branch 'upstream'

[deliverable/linux.git] / drivers / scsi / sata_vsc.c

diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index b574379a7a82168542cbd6914dea268148c4fd76..2d448e84889cfceed5810a6f0fbe502fc2e7f9dd 100644 (file)
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -223,12 +223,11 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,
                                handled++;
                        }
 
-                       if (ap && !(ap->flags &
-                                   (ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) {
+                       if (ap && !(ap->flags & ATA_FLAG_PORT_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 += ata_host_intr(ap, qc);
                                } else {
                                        printk(KERN_DEBUG "%s: ignoring interrupt(s)\n", __FUNCTION__);