diff --git a/[refs] b/[refs]
index 710fc328f567..deb38111d462 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e
+refs/heads/master: 84ac69e8bf9f36eb0166817373336d14fa58f5cc
diff --git a/trunk/drivers/scsi/sata_vsc.c b/trunk/drivers/scsi/sata_vsc.c
index 8c818d47c1fd..9f621a97c977 100644
--- a/trunk/drivers/scsi/sata_vsc.c
+++ b/trunk/drivers/scsi/sata_vsc.c
@@ -229,14 +229,13 @@ 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.flags & ATA_TFLAG_POLLING)))
 					handled += ata_host_intr(ap, qc);
-				} else if (is_vsc_sata_int_err(i, int_status)) {
+				else if (is_vsc_sata_int_err(i, int_status)) {
 					/*
 					 * On some chips (i.e. Intel 31244), an error 
 					 * interrupt will sneak in at initialization