From f454ecf7544077349c24e9fcfd418dbfca927063 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 14 Nov 2008 18:26:49 +0100 Subject: [PATCH] libudev: device - handle disk "device" link for partitions in deprecated sysfs layout Thanks to Mikhail Kolesnik for finding this. --- udev/lib/libudev-device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c index eda3f5d97..c4714e408 100644 --- 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)); -- 2.30.2