diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-02-26 07:54:56 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-03-13 08:29:46 +1000 |
| commit | c971864565eb114e4b34f17b0d2244e8e6e1e005 (patch) | |
| tree | 84779632773a203be3ecd402425e7781b200a4c5 | |
| parent | 2cbbe80efc485d2d05b06efe1e2e01f81f3e06f6 (diff) | |
config: search for PnPID on all parents (#75513)server-1.15-branch
The PnPID for a device may not be on the immediate parent, so search up the
device tree until we find one.
X.Org Bug 75513 <http://bugs.freedesktop.org/show_bug.cgi?id=75513>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
(cherry picked from commit 795066477ee81b5b82e490eac8bed6b656d01f17)
| -rw-r--r-- | config/hal.c | 16 | ||||
| -rw-r--r-- | config/udev.c | 15 |
2 files changed, 24 insertions, 7 deletions
diff --git a/config/hal.c b/config/hal.c index 2ead556b0..d8e8db7c2 100644 --- a/config/hal.c +++ b/config/hal.c @@ -184,8 +184,7 @@ device_added(LibHalContext * hal_ctx, const char *udi) parent = get_prop_string(hal_ctx, udi, "info.parent"); if (parent) { int usb_vendor, usb_product; - - attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id"); + char *old_parent; /* construct USB ID in lowercase - "0000:ffff" */ usb_vendor = libhal_device_get_property_int(hal_ctx, parent, @@ -203,7 +202,18 @@ device_added(LibHalContext * hal_ctx, const char *udi) == -1) attrs.usb_id = NULL; - free(parent); + attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id"); + old_parent = parent; + + while (!attrs.pnp_id && + (parent = get_prop_string(hal_ctx, parent, "info.parent"))) { + attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id"); + + free(old_parent); + old_parent = parent; + } + + free(old_parent); } input_options = input_option_new(NULL, "_source", "server/hal"); diff --git a/config/udev.c b/config/udev.c index b55b78ec5..bcafbd9d8 100644 --- a/config/udev.c +++ b/config/udev.c @@ -130,10 +130,6 @@ device_added(struct udev_device *udev_device) LOG_PROPERTY(ppath, "NAME", name); } - if (pnp_id) - attrs.pnp_id = strdup(pnp_id); - LOG_SYSATTR(ppath, "id", pnp_id); - /* construct USB ID in lowercase hex - "0000:ffff" */ if (product && sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) { @@ -143,6 +139,17 @@ device_added(struct udev_device *udev_device) else LOG_PROPERTY(ppath, "PRODUCT", product); } + + while (!pnp_id && (parent = udev_device_get_parent(parent))) { + pnp_id = udev_device_get_sysattr_value(parent, "id"); + if (!pnp_id) + continue; + + attrs.pnp_id = strdup(pnp_id); + ppath = udev_device_get_devnode(parent); + LOG_SYSATTR(ppath, "id", pnp_id); + } + } if (!name) name = "(unnamed)"; |