summaryrefslogtreecommitdiff
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-25 03:16:16 +0000
committerQMK Bot <hello@qmk.fm>2021-04-25 03:16:16 +0000
commit2a61a500de6fb286cedf644f56d70d05a0b96f0d (patch)
treec25c5066825ff02733cb8f347efbb444733eb998 /tmk_core/protocol
parent64a9cf18e154aab7c767f2a519530d4190f49d8c (diff)
parentd3bf3d3b1cfa9bd6d60ef605cf767e1fb1957c07 (diff)
downloadqmk_firmware-2a61a500de6fb286cedf644f56d70d05a0b96f0d.tar.gz
qmk_firmware-2a61a500de6fb286cedf644f56d70d05a0b96f0d.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/chibios/usb_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 0703cdc718..d04302acae 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -953,8 +953,8 @@ int8_t sendchar(uint8_t c) {
*/
const sysinterval_t timeout = timed_out ? TIME_IMMEDIATE : TIME_MS2I(5);
- const size_t result = chnWriteTimeout(&drivers.console_driver.driver, &c, 1, timeout);
- timed_out = (result == 0);
+ const size_t result = chnWriteTimeout(&drivers.console_driver.driver, &c, 1, timeout);
+ timed_out = (result == 0);
return result;
}