All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali@kernel.org>
To: "Stefan Roese" <sr@denx.de>, "Marek Behún" <kabel@kernel.org>
Cc: u-boot@lists.denx.de
Subject: [PATCH 1/2] arm: mvebu: turris_omnia: Do not fail in fixup_mtd_partitions when partitions do not exist
Date: Mon,  1 Aug 2022 12:02:19 +0200	[thread overview]
Message-ID: <20220801100220.24017-1-pali@kernel.org> (raw)

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>
---
 board/CZ.NIC/turris_omnia/turris_omnia.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/board/CZ.NIC/turris_omnia/turris_omnia.c b/board/CZ.NIC/turris_omnia/turris_omnia.c
index e262ea1aba51..d836ac94ec29 100644
--- a/board/CZ.NIC/turris_omnia/turris_omnia.c
+++ b/board/CZ.NIC/turris_omnia/turris_omnia.c
@@ -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)
-- 
2.20.1


             reply	other threads:[~2022-08-01 10:03 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-01 10:02 Pali Rohár [this message]
2022-08-01 10:02 ` [PATCH 2/2] arm: mvebu: turris_omnia: Increase fdt size in fixup_mtd_partitions Pali Rohár
2022-08-01 11:55   ` Stefan Roese
2022-08-01 15:54   ` Marek Behún
2022-08-09 11:32   ` Stefan Roese
2022-08-01 11:55 ` [PATCH 1/2] arm: mvebu: turris_omnia: Do not fail in fixup_mtd_partitions when partitions do not exist Stefan Roese
2022-08-01 15:54 ` Marek Behún
2022-08-09 11:32 ` Stefan Roese

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220801100220.24017-1-pali@kernel.org \
    --to=pali@kernel.org \
    --cc=kabel@kernel.org \
    --cc=sr@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.