From 67f8ac6a53f878d148b70d693877c73e9a2837d8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 9 Mar 2010 20:38:45 -0800 Subject: [PATCH] --- yaml --- r: 188052 b: refs/heads/master c: 9e49f6c1339a7972e23a335c4c71a289b4c6f65b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/bf54x-keys.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 35aadd2e8ad7..91122dd78879 100644 --- 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 index fe376a27fe57..593c052416b9 100644 --- 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);