diff --git a/[refs] b/[refs]
index d391c7a4ee2b..b4f763bd2043 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88f93a31dcd950fa6b27a5721428de7e01369c06
+refs/heads/master: 23cfce8924f1e7ff1d14b8f1afd7550182026d16
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index d6b8d8e6364b..673ddf611d0e 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -4340,9 +4340,9 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
 
 #ifdef ATA_IRQ_TRAP
 	if ((ap->stats.idle_irq % 1000) == 0) {
-		handled = 1;
 		ata_irq_ack(ap, 0); /* debug trap */
 		printk(KERN_WARNING "ata%d: irq trap\n", ap->id);
+		return 1;
 	}
 #endif
 	return 0;	/* irq not handled */