From 9012172e1e9749670ad40c756a6da8f24bc4037b Mon Sep 17 00:00:00 2001 From: Thomas Stranger Date: Sat, 8 May 2021 09:46:19 +0200 Subject: [PATCH] drivers: can: init timing.sjw also in canfd mode This commit resolves the undefined behviour caused by missing timing.sjw initialization. Signed-off-by: Thomas Stranger --- drivers/can/can_mcan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/can/can_mcan.c b/drivers/can/can_mcan.c index f1526df537cba..39d3790493678 100644 --- a/drivers/can/can_mcan.c +++ b/drivers/can/can_mcan.c @@ -343,11 +343,11 @@ int can_mcan_init(const struct device *dev, const struct can_mcan_config *cfg, } #endif + timing.sjw = cfg->sjw; #ifdef CONFIG_CAN_FD_MODE timing_data.sjw = cfg->sjw_data; can_mcan_configure_timing(can, &timing, &timing_data); #else - timing.sjw = cfg->sjw; can_mcan_configure_timing(can, &timing, NULL); #endif