arm: mvebu: turris_omnia: Do not fail in fixup_mtd_partitions when partitions do...
authorPali Rohár <pali@kernel.org>
Mon, 1 Aug 2022 10:02:19 +0000 (12:02 +0200)
committerStefan Roese <sr@denx.de>
Tue, 9 Aug 2022 06:57:23 +0000 (08:57 +0200)
All partitions are created by fixup_mtd_partitions() function, so they do
not have to exist just for their removal need.

Fixes: 92f36c8e74c1 ("arm: mvebu: turris_omnia: fixup MTD partitions in Linux' DTB")
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Marek Behún <kabel@kernel.org>
board/CZ.NIC/turris_omnia/turris_omnia.c

index a7c1c1f..796c55f 100644 (file)
@@ -974,11 +974,10 @@ static bool fixup_mtd_partitions(void *blob, int offset, struct mtd_info *mtd)
        int parts;
 
        parts = fdt_subnode_offset(blob, offset, "partitions");
-       if (parts < 0)
-               return false;
-
-       if (fdt_del_node(blob, parts) < 0)
-               return false;
+       if (parts >= 0) {
+               if (fdt_del_node(blob, parts) < 0)
+                       return false;
+       }
 
        parts = fdt_add_subnode(blob, offset, "partitions");
        if (parts < 0)