diff options
| -rw-r--r-- | common/keyboard_scan.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/common/keyboard_scan.c b/common/keyboard_scan.c index 8ec7d5d3d2..7bebac8481 100644 --- a/common/keyboard_scan.c +++ b/common/keyboard_scan.c @@ -6,6 +6,7 @@ /* Keyboard scanner module for Chrome EC */ #include "adc.h" +#include "atomic_bit.h" #include "chipset.h" #include "clock.h" #include "common.h" @@ -139,16 +140,21 @@ static int keyboard_scan_is_enabled(void) void keyboard_scan_enable(int enable, enum kb_scan_disable_masks mask) { + atomic_val_t old; /* Access atomically */ if (enable) { - atomic_clear_bits((atomic_t *)&disable_scanning_mask, mask); + old = atomic_clear_bits((atomic_t *)&disable_scanning_mask, + mask); } else { - atomic_or((atomic_t *)&disable_scanning_mask, mask); + old = atomic_or((atomic_t *)&disable_scanning_mask, mask); clear_typematic_key(); } - /* Let the task figure things out */ - task_wake(TASK_ID_KEYSCAN); + /* Using atomic_get() causes build errors on some archs */ + if (old != disable_scanning_mask) { + /* If the mask has changed, let the task figure things out */ + task_wake(TASK_ID_KEYSCAN); + } } /** |