diff options
author | Tom Rini <trini@konsulko.com> | 2022-09-18 08:34:31 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-09-18 08:34:31 -0400 |
commit | b6c50e5831f6ce3800d4b3cf3c7aa35dde8c48d9 (patch) | |
tree | 4403d1b2ff259014c01855e08191ad0d1c294741 /arch/arm/mach-stm32mp/cmd_stm32prog | |
parent | d219fc06b30d4b1ac4fac6c40b2ca69cb5ecf642 (diff) | |
parent | 8695fbb3a7ff3640eff62f7123323b16546d5b35 (diff) |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-watchdog into next
- Migrate watchdog reset to cyclic infrastructure (Stefan)
Diffstat (limited to 'arch/arm/mach-stm32mp/cmd_stm32prog')
-rw-r--r-- | arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c index 2932eae757..1a69bc3897 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_serial.c @@ -247,7 +247,7 @@ static int stm32prog_serial_getc_err(void) err = ops->getc(down_serial_dev); if (err == -EAGAIN) { ctrlc(); - WATCHDOG_RESET(); + schedule(); } } while ((err == -EAGAIN) && (!had_ctrlc())); @@ -276,7 +276,7 @@ static bool stm32prog_serial_get_buffer(u8 *buffer, u32 *count) *count -= 1; } else if (err == -EAGAIN) { ctrlc(); - WATCHDOG_RESET(); + schedule(); if (get_timer(start) > TIMEOUT_SERIAL_BUFFER) { err = -ETIMEDOUT; break; @@ -852,7 +852,7 @@ bool stm32prog_serial_loop(struct stm32prog_data *data) stm32prog_serial_result(ACK_BYTE); cmd_func[counter](data); } - WATCHDOG_RESET(); + schedule(); } /* clean device */ |