From 0814cb0c7bf1482d225017c372574159e8a8d57e Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Tue, 21 Mar 2006 16:06:53 +0000
Subject: [PATCH] --- yaml --- r: 22385 b: refs/heads/master c:
 23cfce8924f1e7ff1d14b8f1afd7550182026d16 h: refs/heads/master i:   22383:
 34efecafb4b0e0d304001589c1494e3a5b5badcf v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/scsi/libata-core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 */