From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 5/6] ARM: am335x: NAND MLO update: always let the user confirm updating
Date: Tue, 30 Sep 2014 15:10:31 +0200 [thread overview]
Message-ID: <1412082632-25290-6-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1412082632-25290-1-git-send-email-s.hauer@pengutronix.de>
Before actually doing something the user should always confirm the
update. Move the question out of the if() block.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/mach-omap/am33xx_bbu_nand.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap/am33xx_bbu_nand.c b/arch/arm/mach-omap/am33xx_bbu_nand.c
index ed55fd1..ee767d3 100644
--- a/arch/arm/mach-omap/am33xx_bbu_nand.c
+++ b/arch/arm/mach-omap/am33xx_bbu_nand.c
@@ -80,12 +80,12 @@ static int nand_xloadslots_update_handler(struct bbu_handler *handler,
nh = container_of(handler, struct nand_bbu_handler, bbu_handler);
+ ret = bbu_confirm(data);
+ if (ret != 0)
+ return ret;
+
/* check if the devicefile has been overwritten */
if (strcmp(data->devicefile, nh->devicefile[0]) != 0) {
- ret = bbu_confirm(data);
- if (ret != 0)
- return ret;
-
ret = write_image(data->devicefile, image, size);
if (ret != 0)
return ret;
--
2.1.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-09-30 13:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-30 13:10 AM335x patches Sascha Hauer
2014-09-30 13:10 ` [PATCH 1/6] ARM: am33xx update SPI NOR: Check image size before flashing Sascha Hauer
2014-09-30 13:10 ` [PATCH 2/6] ARM: am33xx update SPI NOR: Ask use " Sascha Hauer
2014-09-30 13:10 ` [PATCH 3/6] ARM: am335x: Add a NAND update handler for the regular barebox Sascha Hauer
2014-09-30 13:10 ` [PATCH 4/6] ARM: am335x Phytec phyCORE: register SPI NOR and NAND update handlers Sascha Hauer
2014-09-30 13:10 ` Sascha Hauer [this message]
2014-09-30 13:10 ` [PATCH 6/6] Documentation: Add some TI AM335x specific documentation 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=1412082632-25290-6-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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