From c14bf725d0506e8fde894c26cb397909f02b6291 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 16 Feb 2007 01:28:26 -0800
Subject: [PATCH] --- yaml --- r: 48611 b: refs/heads/master c:
 5575ddf75ca7e61d6f69b96368e03dd88edd4604 h: refs/heads/master i:   48609:
 3857a9ea33bb1870cc984e1c59e423ebcb9cbecc   48607:
 86e2955a31972dc283a7b83990edb1011729c11d v: v3

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

diff --git a/[refs] b/[refs]
index 739c0dddb036..397062812802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 472900b8b02bf3782b06dcf0acdef26811c2b995
+refs/heads/master: 5575ddf75ca7e61d6f69b96368e03dd88edd4604
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index e6dc8b8839dd..0133f4f9e9f0 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -565,10 +565,8 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained,
 
 	/* Uninstall? */
 	if (handle == handle_bad_irq) {
-		if (desc->chip != &no_irq_chip) {
-			desc->chip->mask(irq);
-			desc->chip->ack(irq);
-		}
+		if (desc->chip != &no_irq_chip)
+			mask_ack_irq(desc, irq);
 		desc->status |= IRQ_DISABLED;
 		desc->depth = 1;
 	}