From e067593a56e3e28391abad180f53fc4f4d9f3757 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Feb 2009 20:28:29 +0100
Subject: [PATCH] --- yaml --- r: 135783 b: refs/heads/master c:
 8316e38100c70cd1443ac90074eccdd033aa218d h: refs/heads/master i:   135781:
 3821e81c8faaa33fcc543a163c70c3e724f19089   135779:
 681438fd51099380bc7472bc4f95ac98f0fae143   135775:
 b2f9efc00ba4af67428fce1092e443b1074d15ae v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/irq/manage.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 35e25ff063b7..cff545f93ca0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae88a23b32fa7e0dc9fa7ce735966e68eb41b0bc
+refs/heads/master: 8316e38100c70cd1443ac90074eccdd033aa218d
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 7a954b860c07..de5a765e88ab 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -575,7 +575,7 @@ int setup_irq(unsigned int irq, struct irqaction *act)
 void free_irq(unsigned int irq, void *dev_id)
 {
 	struct irq_desc *desc = irq_to_desc(irq);
-	struct irqaction *action, **p, **pp;
+	struct irqaction *action, **p;
 	unsigned long flags;
 
 	WARN(in_interrupt(), "Trying to free IRQ %d from IRQ context!\n", irq);
@@ -592,7 +592,6 @@ void free_irq(unsigned int irq, void *dev_id)
 	p = &desc->action;
 	for (;;) {
 		action = *p;
-		pp = p;
 
 		if (!action) {
 			WARN(1, "Trying to free already-free IRQ %d\n", irq);
@@ -601,15 +600,13 @@ void free_irq(unsigned int irq, void *dev_id)
 			return;
 		}
 
+		if (action->dev_id == dev_id)
+			break;
 		p = &action->next;
-		if (action->dev_id != dev_id)
-			continue;
-
-		break;
 	}
 
 	/* Found it - now remove it from the list of entries: */
-	*pp = action->next;
+	*p = action->next;
 
 	/* Currently used only by UML, might disappear one day: */
 #ifdef CONFIG_IRQ_RELEASE_METHOD