chiark / gitweb /
[PATCH] Fix bug where we did not use the "converted" kernel name if we had no rule.
[elogind.git] / namedev.c
index 68ca5dd306811e5b9b4de4e386d9feca9523920f..f138fe976955fe99bb3c24318acb132369619c1b 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -112,7 +112,7 @@ int add_perm_dev(struct perm_device *new_dev)
 
        /* update the values if we already have the device */
        list_for_each_entry(dev, &perm_device_list, node) {
-               if (strcmp_pattern(new_dev->name, dev->name))
+               if (strcmp(new_dev->name, dev->name))
                        continue;
                copy_var(dev, new_dev, mode);
                copy_string(dev, new_dev, owner);
@@ -745,7 +745,7 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        }
 
        /* no rule was found so we use the kernel name */
-       strfieldcpy(udev->name, class_dev->name);
+       strfieldcpy(udev->name, udev->kernel_name);
        goto done;
 
 found: