---

yaml --- r: 122879 b: refs/heads/master c: ae2754a h: refs/heads/master i: 122877: ac88e5e 122875: f45fb1d 122871: d833f8e 122863: f4e0209 122847: ea3d44a 122815: 1a4814e 122751: 6daa3d5 122623: 79e62ae 122367: b6d9ffb 121855: 189b7f7 120831: a6e573c 118783: e9cfd9d 114687: b5e6a13 v: v3
git-mirror · Dec 21, 2008 · b3224e7 · b3224e7
1 parent 6bd6ac7
commit b3224e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);
 }