---

yaml --- r: 188052 b: refs/heads/master c: 9e49f6c h: refs/heads/master v: v3
git-mirror · Mar 10, 2010 · 67f8ac6 · 67f8ac6
1 parent 1da46d9
commit 67f8ac6
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: eb8bff85c5bd5caef7c374ff32b86545029efb56
+refs/heads/master: 9e49f6c1339a7972e23a335c4c71a289b4c6f65b
diff --git a/trunk/drivers/input/keyboard/bf54x-keys.c b/trunk/drivers/input/keyboard/bf54x-keys.c
@@ -162,7 +162,7 @@ static irqreturn_t bfin_kpad_isr(int irq, void *dev_id)
 	input_sync(input);
 
 	if (bfin_kpad_get_keypressed(bf54x_kpad)) {
-		disable_irq(bf54x_kpad->irq);
+		disable_irq_nosync(bf54x_kpad->irq);
 		bf54x_kpad->lastkey = key;
 		mod_timer(&bf54x_kpad->timer,
 			  jiffies + bf54x_kpad->keyup_test_jiffies);