[OSS-Tools] [PATCH] fixup! libdt: add support for barebox, storage-by-uuid

[Michael Olbrich]

---

>From what I can tell, the patches are still in next, so can you please
squash this fixup? This only worked by accident because the first block
device was the correct one :-/.

Michael

 src/libdt.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libdt.c b/src/libdt.c
index 2e0247e2cab3..2ae3ace4732e 100644
--- a/src/libdt.c
+++ b/src/libdt.c
@@ -2379,7 +2379,7 @@ static struct udev_device *of_find_device_by_uuid(const 
char *uuid)
        udev_enumerate_scan_devices(enumerate);
        devices = udev_enumerate_get_list_entry(enumerate);
        udev_list_entry_foreach(dev_list_entry, devices) {
-               const char *path, *devtype, *outpath, *uuid;
+               const char *path, *devtype, *outpath, *dev_uuid;
                struct udev_device *device;
 
                path = udev_list_entry_get_name(dev_list_entry);
@@ -2390,14 +2390,14 @@ static struct udev_device *of_find_device_by_uuid(const 
char *uuid)
                if (!devtype)
                        continue;
                if (!strcmp(devtype, "disk")) {
-                       uuid = udev_device_get_property_value(device, 
"ID_PART_TABLE_UUID");
-                       if (!strcmp(uuid, uuid)) {
+                       dev_uuid = udev_device_get_property_value(device, 
"ID_PART_TABLE_UUID");
+                       if (!strcmp(dev_uuid, uuid)) {
                                outpath = udev_device_get_devnode(device);
                                return device;
                        }
                } else if (!strcmp(devtype, "partition")) {
-                       uuid = udev_device_get_property_value(device, 
"ID_PART_ENTRY_UUID");
-                       if (!strcmp(uuid, uuid)) {
+                       dev_uuid = udev_device_get_property_value(device, 
"ID_PART_ENTRY_UUID");
+                       if (!strcmp(dev_uuid, uuid)) {
                                outpath = udev_device_get_devnode(device);
                                return device;
                        }
-- 
2.30.2


_______________________________________________
OSS-Tools mailing list
OSS-Tools@pengutronix.de