[OSS-Tools] [PATCH v2 3/8] libdt: drop broken if-branch

[Ahmad Fatoum <a.fatoum@pengutronix.de>]

device_find_block_device returns 0 on success, so the way the else if
clause is now, only if there is a block device, the code falls through.
If there is none, a 0 is returned, but devpath is not populated breaking
the contract of the function. Just drop the branch for now and add it back
later in a way that works.

Fixes: 929ed64cb42f ("of_get_devicepath: make partition finding more robust")
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 src/libdt.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/libdt.c b/src/libdt.c
index 3f4595707554..a4f0e256ef6a 100644
--- a/src/libdt.c
+++ b/src/libdt.c
@@ -2519,13 +2519,10 @@ int of_get_devicepath(struct device_node *partition_node, char **devpath, off_t
 	 */
 	dev = of_find_device_by_node_path(partition_node->full_name);
 	if (dev) {
-		if (udev_device_is_eeprom(dev)) {
+		if (udev_device_is_eeprom(dev))
 			return udev_parse_eeprom(dev, devpath);
-		} else if (!udev_parse_mtd(dev, devpath, size)) {
+		if (!udev_parse_mtd(dev, devpath, size))
 			return 0;
-		} else if (device_find_block_device(dev, devpath)) {
-			return of_parse_partition(partition_node, offset, size);
-		}
 
 		/*
 		 * If we find a udev_device but couldn't classify it above,
-- 
2.39.2