summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chip/stm32/usb_console.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/chip/stm32/usb_console.c b/chip/stm32/usb_console.c
index a8b219bb87..47e31711e0 100644
--- a/chip/stm32/usb_console.c
+++ b/chip/stm32/usb_console.c
@@ -146,7 +146,8 @@ static int usb_wait_console(void)
*/
if (last_tx_ok) {
while (usb_console_tx_valid() || !is_reset) {
- if (timestamp_expired(deadline, NULL)) {
+ if (timestamp_expired(deadline, NULL) ||
+ in_interrupt_context()) {
last_tx_ok = 0;
return EC_ERROR_TIMEOUT;
}