Imported Debian patch 2:1.15.1-0ubuntu2.6
[deb_xorg-server.git] / debian / patches / config-add-no-removal.patch
1 diff --git a/config/udev.c b/config/udev.c
2 index 454838f..74ac998 100644
3 --- a/config/udev.c
4 +++ b/config/udev.c
5 @@ -300,10 +300,9 @@ wakeup_handler(pointer data, int err, pointer read_mask)
6 return;
7 action = udev_device_get_action(udev_device);
8 if (action) {
9 - if (!strcmp(action, "add")) {
10 - device_removed(udev_device);
11 + if (!strcmp(action, "add"))
12 device_added(udev_device);
13 - } else if (!strcmp(action, "change")) {
14 + else if (!strcmp(action, "change")) {
15 /* ignore change for the drm devices */
16 if (strcmp(udev_device_get_subsystem(udev_device), "drm")) {
17 device_removed(udev_device);
18 diff --git a/hw/xfree86/os-support/linux/lnx_platform.c b/hw/xfree86/os-support/linux/lnx_platform.c
19 index 76f5583..c125e35 100644
20 --- a/hw/xfree86/os-support/linux/lnx_platform.c
21 +++ b/hw/xfree86/os-support/linux/lnx_platform.c
22 @@ -126,6 +126,8 @@ xf86PlatformDeviceProbe(struct OdevAttributes *attribs)
23 return;
24
25 out_free:
26 + LogMessage(X_INFO, "config/udev: Ignoring already known drm device (%s)\n",
27 + path);
28 config_odev_free_attribute_list(attribs);
29 }
30