From b3224e7a67c3a427e66fac19d63da08dfe2ae7e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= <khc@pm.waw.pl>
Date: Fri, 9 May 2008 02:14:09 +0200
Subject: [PATCH] --- yaml --- r: 122879 b: refs/heads/master c:
 ae2754a975694a3865788e303b741d0f616bc43a h: refs/heads/master i:   122877:
 ac88e5ecd62fa2fa5f2512de793613e618c88714   122875:
 f45fb1dad1322834c165971515071d2bb9434d4b   122871:
 d833f8e9468a34b2282e6b55b30d7a02e038b4d4   122863:
 f4e02090b3fd4ad24977e898ff9f72c56a7361ab   122847:
 ea3d44ad39424f65cf74c24e0ab0e1251eb23f81   122815:
 1a4814e250fe23fbfe5b3a2b990b8f930bfa5894   122751:
 6daa3d51d7075525f05f5211545e144444ae1142   122623:
 79e62ae95698e34f4644399f9231b62c2f6bc052   122367:
 b6d9ffbbeb5d838e64e46e4ef3da9073a0dde514   121855:
 189b7f72aa64eecf1b3ee4b8652d4973b4cdeb92   120831:
 a6e573c8c61348f6c7273e901eb17f4356349edd   118783:
 e9cfd9d0e9c7c1ce7a6051b7a72d180d1d5e5070   114687:
 b5e6a135573c779a59c8ee52a2b1c8f9dfd54520 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 843a4d3d03b2..b485d26095f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3edcfb2937054fb546ecf3a8883675751db16c6f
+refs/heads/master: ae2754a975694a3865788e303b741d0f616bc43a
diff --git a/trunk/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/trunk/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
index 988bc1bbf4f2..444c2ae21db4 100644
--- a/trunk/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+++ b/trunk/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -70,6 +70,7 @@ void qmgr_disable_irq(unsigned int queue)
 	spin_lock_irqsave(&qmgr_lock, flags);
 	__raw_writel(__raw_readl(&qmgr_regs->irqen[0]) & ~(1 << queue),
 		     &qmgr_regs->irqen[0]);
+	__raw_writel(1 << queue, &qmgr_regs->irqstat[0]); /* clear */
 	spin_unlock_irqrestore(&qmgr_lock, flags);
 }