summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorZhang Bo <zbsdta@126.com>2018-02-05 14:56:21 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-02-09 16:15:45 -0800
commitea4f7bd2aca9f68470e9aac0fc9432fd180b1fe7 (patch)
tree0853e555970f6310b792cc009e42d33697a34f89 /drivers/input
parent0004520af32fca8b40abe78c11654be4e9e20fdf (diff)
downloadlinux-ea4f7bd2aca9f68470e9aac0fc9432fd180b1fe7.tar.bz2
Input: matrix_keypad - fix race when disabling interrupts
If matrix_keypad_stop() is executing and the keypad interrupt is triggered, disable_row_irqs() may be called by both matrix_keypad_interrupt() and matrix_keypad_stop() at the same time, causing interrupts to be disabled twice and the keypad being "stuck" after resuming. Take lock when setting keypad->stopped to ensure that ISR will not race with matrix_keypad_stop() disabling interrupts. Signed-off-by: Zhang Bo <zbsdta@126.com> Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/matrix_keypad.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index 1f316d66e6f7..41614c185918 100644
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -218,8 +218,10 @@ static void matrix_keypad_stop(struct input_dev *dev)
{
struct matrix_keypad *keypad = input_get_drvdata(dev);
+ spin_lock_irq(&keypad->lock);
keypad->stopped = true;
- mb();
+ spin_unlock_irq(&keypad->lock);
+
flush_work(&keypad->work.work);
/*
* matrix_keypad_scan() will leave IRQs enabled;