From cffbf04a364560f23c5f27d87a60001dc9d170f6 Mon Sep 17 00:00:00 2001
From: Pawel MOLL <pawel.moll@st.com>
Date: Mon, 1 Sep 2008 10:12:11 +0100
Subject: [PATCH] --- yaml --- r: 116381 b: refs/heads/master c:
 7e6e178ab1548c8d894a77593e757acf4510b8ba h: refs/heads/master i:   116379:
 9ce7ee8d94a4a9366b3a31d77abd6d6d49f2d334 v: v3

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

diff --git a/[refs] b/[refs]
index c4e77654832a..7961a9628c77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 377bf1e4ac2d894791733270604594c7c851ef83
+refs/heads/master: 7e6e178ab1548c8d894a77593e757acf4510b8ba
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index 964964baefa2..240c64d59267 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -587,7 +587,7 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
 		desc->status &= ~IRQ_DISABLED;
 		desc->status |= IRQ_NOREQUEST | IRQ_NOPROBE;
 		desc->depth = 0;
-		desc->chip->unmask(irq);
+		desc->chip->startup(irq);
 	}
 	spin_unlock_irqrestore(&desc->lock, flags);
 }
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index ae1b684e048c..9aa3e7b81389 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -397,10 +397,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 		if (!(desc->status & IRQ_NOAUTOEN)) {
 			desc->depth = 0;
 			desc->status &= ~IRQ_DISABLED;
-			if (desc->chip->startup)
-				desc->chip->startup(irq);
-			else
-				desc->chip->enable(irq);
+			desc->chip->startup(irq);
 		} else
 			/* Undo nested disables: */
 			desc->depth = 1;