From 7c3a9a1dc603a438b124946d7cb779238d3933cd Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 5 Feb 2010 17:45:14 +0900
Subject: [PATCH] --- yaml --- r: 181177 b: refs/heads/master c:
 b06ede84dd1473dec7c6af03a41c8d04d2fee437 h: refs/heads/master i:   181175:
 fb5e89ed4e20b7a77513c0627605efdbd91f842a v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sh/cchips/hd6446x/hd64461.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 51e0af2c16dc..f3f2544e16a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b0be1a4f2f7d8280574aa6e5eac2dd3dd57e2b7
+refs/heads/master: b06ede84dd1473dec7c6af03a41c8d04d2fee437
diff --git a/trunk/arch/sh/cchips/hd6446x/hd64461.c b/trunk/arch/sh/cchips/hd6446x/hd64461.c
index b447091fc064..bcb31ae84a51 100644
--- a/trunk/arch/sh/cchips/hd6446x/hd64461.c
+++ b/trunk/arch/sh/cchips/hd6446x/hd64461.c
@@ -56,18 +56,15 @@ static struct irq_chip hd64461_irq_chip = {
 static void hd64461_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
 	unsigned short intv = __raw_readw(HD64461_NIRR);
-	struct irq_desc *ext_desc;
 	unsigned int ext_irq = HD64461_IRQBASE;
 
 	intv &= (1 << HD64461_IRQ_NUM) - 1;
 
-	while (intv) {
-		if (intv & 1) {
-			ext_desc = irq_desc + ext_irq;
-			handle_level_irq(ext_irq, ext_desc);
-		}
-		intv >>= 1;
-		ext_irq++;
+	for (; intv; intv >>= 1, ext_irq++) {
+		if (!(intv & 1))
+			continue;
+
+		generic_handle_irq(ext_irq);
 	}
 }