mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-28 11:33:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

logind: use new udev_enumerate_add_match_parent() where applicable

Browse Source
This commit is contained in:
Lennart Poettering 2011-07-13 21:49:21 +02:00
parent 309c2a2ce9
commit 2eb916cdff
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/logind-dbus.c
View File

@ -550,7 +550,7 @@ fail:
return r;
}
static int trigger_device(Manager *m, const char *prefix) {
static int trigger_device(Manager *m, struct udev_device *d) {
struct udev_enumerate *e;
struct udev_list_entry *first, *item;
int r;
@ -563,6 +563,14 @@ static int trigger_device(Manager *m, const char *prefix) {
goto finish;
}
if (d) {
if (udev_enumerate_add_match_parent(e, d) < 0) {
r = -EIO;
goto finish;
}
}
if (udev_enumerate_scan_devices(e) < 0) {
r = -EIO;
goto finish;
@ -575,9 +583,6 @@ static int trigger_device(Manager *m, const char *prefix) {
p = udev_list_entry_get_name(item);
if (prefix && !path_startswith(p, prefix))
continue;
t = strappend(p, "/uevent");
if (!t) {
r = -ENOMEM;
@ -637,7 +642,7 @@ static int attach_device(Manager *m, const char *seat, const char *sysfs) {
if (r < 0)
goto finish;
r = trigger_device(m, sysfs);
r = trigger_device(m, d);
finish:
free(rule);

1
src/logind.h
View File

@ -38,7 +38,6 @@
* direct client API
*
* udev:
* enumerate recursively with libudev when triggering
* use sysfs in device hash table, not sysname, when fb driver is fixed
*
* non-local X11 server