libudev: device - handle disk "device" link for partitions in deprecated sysfs layout

[elogind.git] / udev / lib / libudev-device.c

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index e9d040cdfc43a88e4005f9b8d6bf0e8ef717950d..c4714e4088d1a8dc6f1b5b0cc774fab307bf6e12 100644 (file)
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -501,9 +501,11 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
            strncmp(udev_device->devpath, "/block/", 7) == 0) {
                util_strlcpy(path, udev_device->syspath, sizeof(path));
                util_strlcat(path, "/device", sizeof(path));
-               if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0)
+               if (util_resolve_sys_link(udev_device->udev, path, sizeof(path)) == 0) {
                        udev_device_parent = udev_device_new_from_syspath(udev_device->udev, path);
-               return udev_device_parent;
+                       if (udev_device_parent != NULL)
+                               return udev_device_parent;
+               }
        }
 
        util_strlcpy(path, udev_device->syspath, sizeof(path));
@@ -985,7 +987,7 @@ struct udev_list_entry *udev_device_add_property(struct udev_device *udev_device
                list_entry = udev_device_get_properties_list_entry(udev_device);
                list_entry = udev_list_entry_get_by_name(list_entry, key);
                if (list_entry != NULL)
-                       udev_list_entry_remove(list_entry);
+                       udev_list_entry_delete(list_entry);
                return NULL;
        }
        return udev_list_entry_add(udev_device->udev, &udev_device->properties_list, key, value, 1, 0);