[PATCH] improve klibc fixup integration

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 39f033726c5cdc554e0a641aee77b5845f259c96..80d5f1a499be4c631c5bf6c9f80ce5d441bd70af 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -40,7 +40,6 @@
 #include "udev_version.h"
 #include "logging.h"
 #include "namedev.h"
-#include "klibc_fixups.h"
 #include "udevdb.h"
 
 static struct sysfs_attribute *find_sysfs_attribute(struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device, char *attr);
@@ -692,7 +691,7 @@ try_parent:
 
 }
 
-int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *udev)
+int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev)
 {
        struct sysfs_class_device *class_dev_parent;
        struct sysfs_device *sysfs_device = NULL;
@@ -718,9 +717,10 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        }
 
        if (sysfs_device) {
-               dbg("found /device-device: path='%s', bus_id='%s', bus='%s'",
+               dbg("found devices device: path='%s', bus_id='%s', bus='%s'",
                    sysfs_device->path, sysfs_device->bus_id, sysfs_device->bus);
                strfieldcpy(udev->bus_id, sysfs_device->bus_id);
+               strfieldcpy(udev->bus, sysfs_device->bus);
        }
 
        strfieldcpy(udev->kernel_name, class_dev->name);