From f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 30 Mar 2010 14:39:51 +0000 Subject: svn merge -r516:HEAD ^/branches/released . --- xorg-server/config/udev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'xorg-server/config') diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c index 69257e935..452fb5a8d 100644 --- a/xorg-server/config/udev.c +++ b/xorg-server/config/udev.c @@ -73,8 +73,11 @@ device_added(struct udev_device *udev_device) goto unwind; parent = udev_device_get_parent(udev_device); - if (parent) - name = udev_device_get_property_value(parent, "NAME"); + if (parent) { + name = udev_device_get_sysattr_value(parent, "name"); + if (!name) + name = udev_device_get_property_value(parent, "NAME"); + } if (!name) name = "(unnamed)"; else -- cgit v1.2.3