Commit 3c6867a1 authored by Dong Aisheng's avatar Dong Aisheng Committed by Rob Herring
Browse files

of: of_reserved_mem: only call memblock_free for normal reserved memory 



For nomap case, the memory block will be removed by memblock_remove()
in early_init_dt_alloc_reserved_memory_arch(). So it's meaningless to
call memblock_free() on error path.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: devicetree@vger.kernel.org
Signed-off-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Link: https://lore.kernel.org/r/20210611131153.3731147-1-aisheng.dong@nxp.com


Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 972d6a7d

drivers/of/of_reserved_mem.c

+2 −1
Original line number Diff line number Diff line
@@ -275,9 +275,10 @@ void __init fdt_init_reserved_mem(void) 
			if (err != 0 && err != -ENOENT) {

				pr_info("node %s compatible matching fail\n",

					rmem->name);

				memblock_free(rmem->base, rmem->size);

				if (nomap)

					memblock_add(rmem->base, rmem->size);

				else

					memblock_free(rmem->base, rmem->size);

			}

		}

	}