From f7f0bc7022b28fe14a654d19323567310f9ab091 Mon Sep 17 00:00:00 2001 From: Lucas Dietrich Date: Mon, 15 Nov 2021 19:06:46 +0100 Subject: [PATCH] drivers: can: Fixed timeout values comparison Trivial fix of compilation error "invalid operands to binary " when CONFIG_CAN_AUTO_BUS_OFF_RECOVERY = n Fixes #40290 Signed-off-by: Lucas Dietrich --- drivers/can/can_mcux_flexcan.c | 4 ++-- drivers/can/can_stm32.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/can/can_mcux_flexcan.c b/drivers/can/can_mcux_flexcan.c index 7afac0a817b..ec3e1b9afff 100644 --- a/drivers/can/can_mcux_flexcan.c +++ b/drivers/can/can_mcux_flexcan.c @@ -469,9 +469,9 @@ int mcux_flexcan_recover(const struct device *dev, k_timeout_t timeout) start_time = k_uptime_ticks(); config->base->CTRL1 &= ~CAN_CTRL1_BOFFREC_MASK; - if (timeout != K_NO_WAIT) { + if (!K_TIMEOUT_EQ(timeout, K_NO_WAIT)) { while (mcux_flexcan_get_state(dev, NULL) == CAN_BUS_OFF) { - if (timeout != K_FOREVER && + if (!K_TIMEOUT_EQ(timeout, K_FOREVER) && k_uptime_ticks() - start_time >= timeout.ticks) { ret = CAN_TIMEOUT; } diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c index d3c1e0118fc..2b0fbebbe9d 100644 --- a/drivers/can/can_stm32.c +++ b/drivers/can/can_stm32.c @@ -593,7 +593,7 @@ int can_stm32_recover(const struct device *dev, k_timeout_t timeout) start_time = k_uptime_ticks(); while (can->ESR & CAN_ESR_BOFF) { - if (timeout != K_FOREVER && + if (!K_TIMEOUT_EQ(timeout, K_FOREVER) && k_uptime_ticks() - start_time >= timeout.ticks) { goto done; }