diff options
author | Joel Challis <git@zvecr.com> | 2020-02-25 14:10:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-25 14:10:04 +0000 |
commit | f6111d49bbfeb90fdb86c4595ba339590b364da7 (patch) | |
tree | 7d6cae52cc4a7d850ab9104f8f92d65c1d39622d /quantum/split_common/matrix.c | |
parent | 891d28a37954ada620fab3727499fe2e9ee3fe65 (diff) | |
download | qmk_firmware-f6111d49bbfeb90fdb86c4595ba339590b364da7.tar.gz qmk_firmware-f6111d49bbfeb90fdb86c4595ba339590b364da7.zip |
Split - Avoid race condition during matrix_init_quantum (#8235)
* Avoid race condition during matrix_init_quantum
* spelling is hard
Diffstat (limited to 'quantum/split_common/matrix.c')
-rw-r--r-- | quantum/split_common/matrix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index a82334128..8b91f8ca8 100644 --- a/quantum/split_common/matrix.c +++ b/quantum/split_common/matrix.c | |||
@@ -190,7 +190,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) | |||
190 | #endif | 190 | #endif |
191 | 191 | ||
192 | void matrix_init(void) { | 192 | void matrix_init(void) { |
193 | keyboard_split_setup(); | 193 | split_pre_init(); |
194 | 194 | ||
195 | // Set pinout for right half if pinout for that half is defined | 195 | // Set pinout for right half if pinout for that half is defined |
196 | if (!isLeftHand) { | 196 | if (!isLeftHand) { |
@@ -231,6 +231,8 @@ void matrix_init(void) { | |||
231 | debounce_init(ROWS_PER_HAND); | 231 | debounce_init(ROWS_PER_HAND); |
232 | 232 | ||
233 | matrix_init_quantum(); | 233 | matrix_init_quantum(); |
234 | |||
235 | split_post_init(); | ||
234 | } | 236 | } |
235 | 237 | ||
236 | void matrix_post_scan(void) { | 238 | void matrix_post_scan(void) { |