From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 8 Oct 2012 07:45:54 +0000 (+0000)
Subject: disk: get_device_and_partition() return value fixes
X-Git-Tag: v2025.01-rc5-pxa1908~16943
X-Git-Url: http://git.dujemihanovic.xyz/html/index.html?a=commitdiff_plain;h=71bba424adcfa8c44100dee0fd139cc057eace65;p=u-boot.git

disk: get_device_and_partition() return value fixes

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 <swarren@nvidia.com>
---

diff --git a/disk/part.c b/disk/part.c
index 30229692fb..a0c77ddc9d 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;
 		}
 	}