chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add a bunch of devices without "device" symlinks.
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index 39f033726c5cdc554e0a641aee77b5845f259c96..b142dda4fe4d18872f5ff1af70483cb0b07a5805 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-40,7
+40,6
@@
#include "udev_version.h"
#include "logging.h"
#include "namedev.h"
#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);
#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 *u
dev)
+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;
{
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) {
}
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);
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);
}
strfieldcpy(udev->kernel_name, class_dev->name);
@@
-798,11
+798,10
@@
perms:
set_empty_perms(udev, perm->mode,
perm->owner,
perm->group);
set_empty_perms(udev, perm->mode,
perm->owner,
perm->group);
- } else {
- set_empty_perms(udev, get_default_mode(),
- get_default_owner(),
- get_default_group());
}
}
+ set_empty_perms(udev, get_default_mode(),
+ get_default_owner(),
+ get_default_group());
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);
dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o",
udev->name, udev->owner, udev->group, udev->mode);