logind: Do not fail display count if a device has no parent

udev_device_get_parent() may return NULL when the device doesn't have a
parent, as is the case with (for example) /sys/devices/virtual/drm/ttm.

Also, log an actual error message instead of "-12 displays connected".

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index ae7b35055a86b48013870b1a6057655ad7c1cfc2..1928f43cd1c314191f872f21340466adac039734 100644 (file)
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -84,7 +84,9 @@ int manager_handle_action(
                  * treat like this under the assumption that there is
                  * no modern drm driver available. */
                 n = manager_count_displays(m);
-                if (n != 1) {
+                if (n < 0)
+                        log_warning("Display counting failed: %s", strerror(-n));
+                else if (n != 1) {
                         log_debug("Ignoring lid switch request, %i displays connected.", n);
                         return 0;
                 }

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index ca34d378ff02fdffdf0c98b93dbce61f7cba08ac..053d2ed63e189df1cfec0c53e8d3093deb672ca7 100644 (file)
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -520,7 +520,7 @@ int manager_count_displays(Manager *m) {
 
                 p = udev_device_get_parent(d);
                 if (!p)
-                        return -ENOMEM;
+                        continue;
 
                 /* If the parent shares the same subsystem as the
                  * device we are looking at then it is a connector,