aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/config/udev.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-03-30 13:47:10 +0000
committermarha <marha@users.sourceforge.net>2010-03-30 13:47:10 +0000
commit5dbc7d7086127f7e65912e505066be821e30661d (patch)
tree5dd1f2696bd3f90dad2035d901f445adccfb9aae /xorg-server/config/udev.c
parent15272ab4ed1e6250412fccd48200ed9eae59608f (diff)
downloadvcxsrv-5dbc7d7086127f7e65912e505066be821e30661d.tar.gz
vcxsrv-5dbc7d7086127f7e65912e505066be821e30661d.tar.bz2
vcxsrv-5dbc7d7086127f7e65912e505066be821e30661d.zip
xserver and xkeyboard-config git update 30/3/2010
Diffstat (limited to 'xorg-server/config/udev.c')
-rw-r--r--xorg-server/config/udev.c7
1 files changed, 5 insertions, 2 deletions
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