From 4754af9ddbd55c5637b56bd9f37d0d3414c839a8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 11 Mar 2014 14:20:51 +1000 Subject: config: only free odev->attrib_name for string types Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- config/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.c b/config/config.c index 7971b8740..4ad733000 100644 --- a/config/config.c +++ b/config/config.c @@ -246,7 +246,8 @@ config_odev_free_attributes(struct OdevAttributes *attribs) case ODEV_ATTRIB_FD: fd = iter->attrib_value; break; } xorg_list_del(&iter->member); - free(iter->attrib_name); + if (iter->attrib_type == ODEV_ATTRIB_STRING) + free(iter->attrib_name); free(iter); } -- cgit v1.2.3 From 795066477ee81b5b82e490eac8bed6b656d01f17 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 Feb 2014 07:54:56 +1000 Subject: config: search for PnPID on all parents (#75513) 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 Signed-off-by: Peter Hutterer Tested-by: Benjamin Tissoires --- config/hal.c | 16 +++++++++++++--- config/udev.c | 15 +++++++++++---- 2 files changed, 24 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/hal.c b/config/hal.c index 94cb6e7cd..ea574ca52 100644 --- a/config/hal.c +++ b/config/hal.c @@ -185,8 +185,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, @@ -204,7 +203,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 d70eeb48c..d88abaaa1 100644 --- a/config/udev.c +++ b/config/udev.c @@ -149,10 +149,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) { @@ -164,6 +160,17 @@ device_added(struct udev_device *udev_device) LOG_PROPERTY(ppath, "PRODUCT", product); attrs.usb_id = usb_id; } + + 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)"; -- cgit v1.2.3