]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
timer: goldfish: Return error when device address is invalid
authorKuan-Wei Chiu <visitorckw@gmail.com>
Mon, 8 Jun 2026 15:47:48 +0000 (15:47 +0000)
committerTom Rini <trini@konsulko.com>
Tue, 23 Jun 2026 18:38:01 +0000 (12:38 -0600)
goldfish_timer_of_to_plat() currently returns success even when
dev_read_addr() fails to find a valid address. This leaves plat->reg
unset and defers the failure to probe().

Return -EINVAL immediately when the address is FDT_ADDR_T_NONE so the
failure is reported at the of_to_plat stage where it belongs. This
aligns the driver with the recent fix introduced in the goldfish
serial driver by Naveen Kumar Chaudhary. [1]

Link: https://lore.kernel.org/u-boot/vgwnt6mnls3lf3zdm6mz5siztzkvppte4ykszbvifjzukvmksf@maaxe5agqpim/
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
drivers/timer/goldfish_timer.c

index 91277d7932ac7010678ef5708c44f9388104656e..59ce43fcb4683505f5cce16f1d6ad641ba73a09a 100644 (file)
@@ -45,8 +45,10 @@ static int goldfish_timer_of_to_plat(struct udevice *dev)
        fdt_addr_t addr;
 
        addr = dev_read_addr(dev);
-       if (addr != FDT_ADDR_T_NONE)
-               plat->reg = addr;
+       if (addr == FDT_ADDR_T_NONE)
+               return -EINVAL;
+
+       plat->reg = addr;
 
        return 0;
 }