mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ladislav Michl <ladis@linux-mips.org>
To: barebox@lists.infradead.org
Subject: [PATCH] environment: Fix overlapping partitions error message
Date: Thu, 11 Oct 2018 18:41:46 +0200	[thread overview]
Message-ID: <20181011164145.GA21891@lenoch> (raw)

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Fixes: b234a6da331f ("environment: Do not use environment when
                      overlapping with other partitions")
---
 common/startup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/startup.c b/common/startup.c
index 832d3262f..5793ea28a 100644
--- a/common/startup.c
+++ b/common/startup.c
@@ -110,9 +110,9 @@ static int check_overlap(const char *path)
 conflict:
 	pr_err("Environment partition (0x%08llx-0x%08llx) "
 		"overlaps with partition %s (0x%08llx-0x%08llx), not using it\n",
-		cenv->offset, cenv->offset + cenv->offset + cenv->size - 1,
+		cenv->offset, cenv->offset + cenv->size - 1,
 		cpart->name,
-		cpart->offset, cpart->offset + cpart->offset + cpart->size - 1);
+		cpart->offset, cpart->offset + cpart->size - 1);
 
 	return -EINVAL;
 }
-- 
2.19.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2018-10-11 16:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-11 16:41 Ladislav Michl [this message]
2018-10-12  5:40 ` Sascha Hauer

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=20181011164145.GA21891@lenoch \
    --to=ladis@linux-mips.org \
    --cc=barebox@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox