Merge remote-tracking branch 'origin/master' into develop

1 files changed, 2 insertions, 2 deletions

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 90f6d6f8da..5115709748 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -189,9 +189,9 @@ static matrix_row_t get_real_keys(uint8_t row, matrix_row_t rowdata) {
     matrix_row_t out = 0;
     for (uint8_t col = 0; col < MATRIX_COLS; col++) {
         // read each key in the row data and check if the keymap defines it as a real key
-        if (keycode_at_keymap_location(0, row, col) && (rowdata & (1 << col))) {
+        if (keycode_at_keymap_location(0, row, col) && (rowdata & (((matrix_row_t)1) << col))) {
             // this creates new row data, if a key is defined in the keymap, it will be set here
-            out |= 1 << col;
+            out |= ((matrix_row_t)1) << col;
         }
     }
     return out;