Revert "udev-seat: skip addition of unconfigured device by event source"

This reverts commit 3a014872ccaea564d6504ddf0033f862abf1e9d2.

Change-Id: I1faf203118398ae534e000965a6887e8f8b6a630

diff --git a/src/udev-seat.c b/src/udev-seat.c
index 70a0c232b991f2b2a83490e5a5dbc2a368494c2b..85f391e5440cae44d4952ccf7f96071f67fa0363 100644 (file)
--- a/src/udev-seat.c
+++ b/src/udev-seat.c
@@ -36,7 +36,6 @@ static const char default_seat_name[] = "default";
 
 char *_udev_monitor_event_source = NULL;
 int _udev_monitor_buffer_size = 0;
-int _udev_monitor_skip_unconfigured_device = 1; //default : skip
 
 static char *
 _udev_get_udev_monitor_event_source(void)
@@ -193,15 +192,12 @@ udev_input_add_devices(struct udev_input *input, struct udev *udev)
                /* Skip unconfigured device. udev will send an event
                 * when device is fully configured  */
                if (!udev_device_get_is_initialized(device)) {
-                       /* Skip only when the skip flag has been set to non-zero. */
-                       if (_udev_monitor_skip_unconfigured_device) {
-                               log_debug(&input->base,
-                                         "%-7s - skip unconfigured input device '%s'\n",
-                                         sysname,
-                                         udev_device_get_devnode(device));
-                               udev_device_unref(device);
-                               continue;
-                       }
+                       log_debug(&input->base,
+                                 "%-7s - skip unconfigured input device '%s'\n",
+                                 sysname,
+                                 udev_device_get_devnode(device));
+                       udev_device_unref(device);
+                       continue;
                }
 
                if (device_added(device, input, NULL) < 0) {
@@ -300,16 +296,6 @@ udev_input_enable(struct libinput *libinput)
                log_info(libinput, "udev: event source is udev (default event source).\n");
        }
 
-       /* Skip only when the event source of udev monitor has been set as "udev" or null. */
-       if (!env || (0 == strncmp("udev", env, 4))) {
-               _udev_monitor_skip_unconfigured_device = 1;
-               log_info(libinput, "will skip addition of unconfigured devices. (env=%s)\n", env ? env : "null");
-       }
-       else {
-               _udev_monitor_skip_unconfigured_device = 0;
-               log_info(libinput, "won't skip addition of unconfigured devices. (env=%s)\n", env);
-       }
-
        if (!input->udev_monitor) {
                log_info(libinput,
                         "udev: failed to create the udev monitor\n");
@@ -471,8 +457,7 @@ libinput_udev_create_context(const struct libinput_interface *interface,
        }
 
        input->udev = udev_ref(udev);
-       if (!_udev_monitor_event_source)
-               _udev_monitor_event_source = strdup("udev");
+       _udev_monitor_event_source = strdup("udev");
 
        return &input->base;
 }