From: Krishna Reddy <vdumpa@xxxxxxxxxx> Ignore disabled nodes in the memory-region nodes list and continue to initialize the rest of enabled nodes. Check if the "reserved-memory" node is available and if it's not available, return 0 to ignore the "reserved-memory" node and continue parsing with next node in memory-region nodes list. Signed-off-by: Krishna Reddy <vdumpa@xxxxxxxxxx> Signed-off-by: Puneet Saxena <puneets@xxxxxxxxxx> --- v2: * Fixed typo in commit message. * Used "of_device_is_available" to check "reserved-memory" nodes are disabled/enabled. drivers/of/of_reserved_mem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 1977ee0adcb1..b0b7a0c4431d 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -322,6 +322,9 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, if (!target) return -ENODEV; + if (!of_device_is_available(target)) + return 0; + rmem = __find_rmem(target); of_node_put(target); -- 2.7.4
