From: Maxime Ripard <maxime@cerno.tech>
To: u-boot@lists.denx.de, Andre Przywara <andre.przywara@arm.com>
Cc: Peng Fan <peng.fan@nxp.com>, Li Jun <jun.li@nxp.com>,
Marek Vasut <marex@denx.de>, Tom Rini <trini@konsulko.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Jagan Teki <jagan@amarulasolutions.com>,
Maxime Ripard <maxime@cerno.tech>
Subject: [PATCH 09/12] fastboot: nand: Fix return error code
Date: Fri, 25 Jun 2021 15:05:44 +0200 [thread overview]
Message-ID: <20210625130547.2177920-10-maxime@cerno.tech> (raw)
In-Reply-To: <20210625130547.2177920-1-maxime@cerno.tech>
Both mtdparts_init() and find_dev_and_part() will return 0 on success
but 1 on failure.
Since the calling functions of fb_nand_lookup expects a negative error
code on failure, we can't just return the returned value of these
functions.
This fixes an issue with the logic that detects whether we support
fastboot slots or not by calling fb_nand_lookup and assuming that
anything >= 0 means the partition is there.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/fastboot/fb_nand.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c
index e07df33d3665..9d832fd8ca9a 100644
--- a/drivers/fastboot/fb_nand.c
+++ b/drivers/fastboot/fb_nand.c
@@ -44,14 +44,14 @@ static int fb_nand_lookup(const char *partname,
if (ret) {
pr_err("Cannot initialize MTD partitions\n");
fastboot_fail("cannot init mtdparts", response);
- return ret;
+ return -EINVAL;
}
ret = find_dev_and_part(partname, &dev, &pnum, part);
if (ret) {
pr_err("cannot find partition: '%s'\n", partname);
fastboot_fail("cannot find partition", response);
- return ret;
+ return -ENODEV;
}
if (dev->id->type != MTD_DEV_TYPE_NAND) {
--
2.31.1
next prev parent reply other threads:[~2021-06-25 13:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 13:05 [PATCH 00/12] Random Fixes for the CHIP Pro Maxime Ripard
2021-06-25 13:05 ` [PATCH 01/12] Revert "sunxi: spl: remove DMA related settings of the NAND controller" Maxime Ripard
2021-06-25 13:05 ` [PATCH 02/12] Revert "spl: nand: sunxi: use PIO instead of DMA" Maxime Ripard
2021-06-25 13:05 ` [PATCH 03/12] Revert "usb: gadget: fastboot: use correct max packet size" Maxime Ripard
2021-06-25 13:47 ` Sean Anderson
2021-06-25 14:14 ` Maxime Ripard
2021-06-29 2:27 ` Peng Fan (OSS)
2021-07-03 13:47 ` Maxime Ripard
2021-06-25 13:05 ` [PATCH 04/12] Kconfig: Migrate SPL_PANIC_ON_RAW_IMAGE Maxime Ripard
2021-06-25 13:05 ` [PATCH 05/12] mtd: Allow for a longer mtdparts table Maxime Ripard
2021-06-25 13:05 ` [PATCH 06/12] fastboot: Add missing newlines Maxime Ripard
2021-06-25 13:40 ` Andre Przywara
2021-06-25 13:05 ` [PATCH 07/12] configs: chip pro: Disable video output Maxime Ripard
2021-06-25 13:38 ` Andre Przywara
2021-06-25 13:05 ` [PATCH 08/12] clk: sunxi: Add missing clock compatible Maxime Ripard
2021-06-25 13:38 ` Andre Przywara
2021-06-25 13:05 ` Maxime Ripard [this message]
2021-06-25 14:08 ` [PATCH 09/12] fastboot: nand: Fix return error code Andre Przywara
2021-06-25 13:05 ` [PATCH 10/12] configs: chip pro: Disable UMS Maxime Ripard
2021-06-25 13:05 ` [PATCH 11/12] configs: chip pro: fix the offsets Maxime Ripard
2021-06-25 13:05 ` [PATCH 12/12] configs: chip pro: Fix NAND Controller name Maxime Ripard
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=20210625130547.2177920-10-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=andre.przywara@arm.com \
--cc=jagan@amarulasolutions.com \
--cc=jun.li@nxp.com \
--cc=marex@denx.de \
--cc=miquel.raynal@bootlin.com \
--cc=peng.fan@nxp.com \
--cc=trini@konsulko.com \
--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.