From d9de3dac5d609a9fe0f551ce4859fa1583a39c8e Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 8 Apr 2026 11:23:14 +0200 Subject: [PATCH] bsps/leon3: Fix LEON3 timer initialization Commit 810b2d50c910a1c2ddf5857fa75945fc892d7c0d introduced a potential NULL pointer access in the LEON3 timer initialization. Fix the initialization order. Update #5541. Signed-off-by: Sebastian Huber --- bsps/sparc/leon3/start/amba.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bsps/sparc/leon3/start/amba.c b/bsps/sparc/leon3/start/amba.c index 60f2190312..2498acc89c 100644 --- a/bsps/sparc/leon3/start/amba.c +++ b/bsps/sparc/leon3/start/amba.c @@ -217,10 +217,11 @@ static void amba_initialize(void) * Note that minimum value is the number of timer instances present in * GRTIMER/GPTIMER hardware. See HW manual. */ - if (leon3_timer_prescaler) - grlib_store_32(&LEON3_Timer_Regs->sreload, leon3_timer_prescaler); + if (leon3_timer_prescaler) { + grlib_store_32(timer_regs->sreload, leon3_timer_prescaler); + } - LEON3_Timer_Regs = (gptimer *)DEV_TO_APB(adev)->start; + LEON3_Timer_Regs = timer_regs; LEON3_Timer_Adev = adev; #endif }