From patchwork Mon Oct 8 17:45:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot] disk: get_device_and_partition() return value fixes Date: Mon, 08 Oct 2012 07:45:54 -0000 From: Stephen Warren X-Patchwork-Id: 190100 Message-Id: <1349718354-28261-1-git-send-email-swarren@wwwdotorg.org> To: Tom Rini Cc: u-boot@lists.denx.de, Stephen Warren , Rob Herring From: Stephen Warren When no valid partitions are found, guarantee that we return -1. This most likely already happens, since the most recent get_partition_info() will have returned an error. However, it's best to be explicit. Remove an unnecessary assignment of ret=0 in the success case; this value is over-written with the processed partition ID later. Signed-off-by: Stephen Warren --- Tom, this probably makes sense to go into the release, although I don't think it's critical. disk/part.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/disk/part.c b/disk/part.c index 3022969..a0c77dd 100644 --- a/disk/part.c +++ b/disk/part.c @@ -624,9 +624,9 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str, */ if (p == MAX_SEARCH_PARTITIONS + 1) *info = tmpinfo; - ret = 0; } else { printf("** No valid partitions found **\n"); + ret = -1; goto cleanup; } }