diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-30 14:39:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-30 14:39:51 +0000 |
| commit | f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff (patch) | |
| tree | 03b82272fdd55070146d5c6c6aa4062446c0f0f8 /xorg-server/config | |
| parent | ff48c0d9098080b51ea12710029135916d117806 (diff) | |
| download | vcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.tar.gz vcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.tar.bz2 vcxsrv-f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff.zip | |
svn merge -r516:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/udev.c | 7 |
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 |