Skip to content

Commit ea4f7bd

Browse files
cepheidxadtor
authored andcommitted
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 <[email protected]> Cc: [email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 0004520 commit ea4f7bd

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/input/keyboard/matrix_keypad.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,10 @@ static void matrix_keypad_stop(struct input_dev *dev)
218218
{
219219
struct matrix_keypad *keypad = input_get_drvdata(dev);
220220

221+
spin_lock_irq(&keypad->lock);
221222
keypad->stopped = true;
222-
mb();
223+
spin_unlock_irq(&keypad->lock);
224+
223225
flush_work(&keypad->work.work);
224226
/*
225227
* matrix_keypad_scan() will leave IRQs enabled;

0 commit comments

Comments
 (0)