From 9d5149b3f2e7e80378907a8d3e4f7a94dfbbbdb8 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 25 Mar 2026 10:00:18 +0100 Subject: of: reserved_mem: use -ENODEV instead of -ENOENT When given reserved memory region doesn't really support given node, return -ENODEV instead of -ENOENT. Then fix __reserved_mem_init_node() function to properly propagate error code different from -ENODEV instead of silently ignoring it. Signed-off-by: Marek Szyprowski Link: https://patch.msgid.link/20260325090023.3175348-3-m.szyprowski@samsung.com Signed-off-by: Rob Herring (Arm) --- drivers/of/of_reserved_mem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 6705b7afebf0..9aff460a0420 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -488,9 +488,10 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem, { extern const struct of_device_id __reservedmem_of_table[]; const struct of_device_id *i; - int ret = -ENOENT; + int ret = -ENODEV; - for (i = __reservedmem_of_table; i < &__rmem_of_table_sentinel; i++) { + for (i = __reservedmem_of_table; ret == -ENODEV && + i < &__rmem_of_table_sentinel; i++) { reservedmem_of_init_fn initfn = i->data; const char *compat = i->compatible; @@ -574,7 +575,7 @@ static void __init fdt_init_reserved_mem_node(struct reserved_mem *rmem, nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL; err = __reserved_mem_init_node(rmem, node); - if (err != 0 && err != -ENOENT) { + if (err != 0 && err != -ENODEV) { pr_info("node %s compatible matching fail\n", rmem->name); if (nomap) memblock_clear_nomap(rmem->base, rmem->size); -- cgit v1.2.3