forked from pool/systemd
da382a7470
- udev: Fix device matching in the accelerometer add: 1019-udev-Fix-device-matching-in-the-accelerometer.patch - keymap: add aditional support for some keyboard keys add: 1018-keymap-add-aditional-support.patch - journalctl: require argument for --priority add: journalctl-require-argument-for-priority - dropped useless patches: libudev-validate-argument-udev_enumerate_new.patch kmod-fix-builtin-typo.patch - rename udev-root-symlink.service to systemd-udev-root-symlink.service. - fix in udev package missing link in basic.target.wants for systemd-udev-root-symlink.service - udev: Fix device matching in the accelerometer add: 1019-udev-Fix-device-matching-in-the-accelerometer.patch - keymap: add aditional support for some keyboard keys add: 1018-keymap-add-aditional-support.patch - journalctl: require argument for --priority add: journalctl-require-argument-for-priority - dropped useless patches: libudev-validate-argument-udev_enumerate_new.patch kmod-fix-builtin-typo.patch - rename udev-root-symlink.service to systemd-udev-root-symlink.service. - fix in udev package missing link in basic.target.wants for systemd-udev-root-symlink.service OBS-URL: https://build.opensuse.org/request/show/150304 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=125
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 1d010426c01044350b2b32d8b3af5d064f7dfe27 Mon Sep 17 00:00:00 2001
|
|
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Thu, 10 Jan 2013 14:23:23 +0100
|
|
Subject: [PATCH] udev: Fix device matching in the accelerometer
|
|
|
|
As we were searching by ID_PATH, it would have been possible
|
|
for us to find a sibling device instead of the device we were
|
|
looking for.
|
|
|
|
This fixes device matching on the WeTab with the upstream kernel,
|
|
as it was trying to use the "Asus Laptop extra buttons" device
|
|
instead of the accelerometer.
|
|
---
|
|
src/udev/accelerometer/accelerometer.c | 11 +----------
|
|
1 files changed, 1 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c
|
|
index 21f5193..2fea388 100644
|
|
--- a/src/udev/accelerometer/accelerometer.c
|
|
+++ b/src/udev/accelerometer/accelerometer.c
|
|
@@ -257,7 +257,6 @@ int main (int argc, char** argv)
|
|
|
|
char devpath[PATH_MAX];
|
|
char *devnode;
|
|
- const char *id_path;
|
|
struct udev_enumerate *enumerate;
|
|
struct udev_list_entry *list_entry;
|
|
|
|
@@ -303,18 +302,10 @@ int main (int argc, char** argv)
|
|
return 1;
|
|
}
|
|
|
|
- id_path = udev_device_get_property_value(dev, "ID_PATH");
|
|
- if (id_path == NULL) {
|
|
- fprintf (stderr, "unable to get property ID_PATH for '%s'", devpath);
|
|
- return 0;
|
|
- }
|
|
-
|
|
/* Get the children devices and find the devnode */
|
|
- /* FIXME: use udev_enumerate_add_match_parent() instead */
|
|
devnode = NULL;
|
|
enumerate = udev_enumerate_new(udev);
|
|
- udev_enumerate_add_match_property(enumerate, "ID_PATH", id_path);
|
|
- udev_enumerate_add_match_subsystem(enumerate, "input");
|
|
+ udev_enumerate_add_match_parent(enumerate, dev);
|
|
udev_enumerate_scan_devices(enumerate);
|
|
udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) {
|
|
struct udev_device *device;
|
|
--
|
|
1.7.7
|
|
|