---

yaml --- r: 145186 b: refs/heads/master c: 7e9e05c h: refs/heads/master v: v3
git-mirror · May 20, 2009 · 1abab20 · 1abab20
1 parent 9163581
commit 1abab20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 950312ce22696ddfa42a957bdadaa9c24151e679
+refs/heads/master: 7e9e05cad94217498e4d9bd6ef7137b4e9e7ed64
diff --git a/trunk/arch/mips/sgi-ip22/ip22-reset.c b/trunk/arch/mips/sgi-ip22/ip22-reset.c
@@ -148,7 +148,7 @@ static irqreturn_t panel_int(int irq, void *dev_id)
 
 	if (sgint->istat1 & SGINT_ISTAT1_PWR) {
 		/* Wait until interrupt goes away */
-		disable_irq(SGI_PANEL_IRQ);
+		disable_irq_nosync(SGI_PANEL_IRQ);
 		init_timer(&debounce_timer);
 		debounce_timer.function = debounce;
 		debounce_timer.expires = jiffies + 5;