From c0663f4d2b67c55e175d9932791d3c387dd73994 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 2 Feb 2011 21:41:12 +0000
Subject: [PATCH] --- yaml --- r: 234707 b: refs/heads/master c:
 3b56f0585fd4c02d047dc406668cb40159b2d340 h: refs/heads/master i:   234705:
 14a6ba43e23132fd779f77209a8600561d464a70   234703:
 5e6c2945bd621a65d8b5fbcb86045040dc5e7468 v: v3

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

diff --git a/[refs] b/[refs]
index 5785261ce8cd..6d29243afb41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1535dfacbf21c4da1b73fcf07c39913da5bd5581
+refs/heads/master: 3b56f0585fd4c02d047dc406668cb40159b2d340
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 33a6ee0ac68f..30bc8de40905 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -1057,10 +1057,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
 	/* If this was the last handler, shut down the IRQ line: */
 	if (!desc->action) {
 		desc->status |= IRQ_DISABLED;
-		if (desc->irq_data.chip->irq_shutdown)
-			desc->irq_data.chip->irq_shutdown(&desc->irq_data);
-		else
-			desc->irq_data.chip->irq_disable(&desc->irq_data);
+		desc->irq_data.chip->irq_shutdown(&desc->irq_data);
 	}
 
 #ifdef CONFIG_SMP