Reset pending actions after returning from possible suspend/sleep actions.

[elogind.git] / src / login / logind-device.c

diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index c5fe92bd6044974d55cb17ed41d3062a542a1500..ffb9162e56c435f7a7add489d410b9e96c94a555 100644 (file)
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -19,11 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <assert.h>
 #include <string.h>
 
-#include "util.h"
+#include "alloc-util.h"
 #include "logind-device.h"
+#include "util.h"
 
 Device* device_new(Manager *m, const char *sysfs, bool master) {
         Device *d;
@@ -54,18 +54,7 @@ Device* device_new(Manager *m, const char *sysfs, bool master) {
         return d;
 }
 
-void device_free(Device *d) {
-        assert(d);
-
-        device_detach(d);
-
-        hashmap_remove(d->manager->devices, d->sysfs);
-
-        free(d->sysfs);
-        free(d);
-}
-
-void device_detach(Device *d) {
+static void device_detach(Device *d) {
         Seat *s;
         SessionDevice *sd;
 
@@ -87,6 +76,17 @@ void device_detach(Device *d) {
         }
 }
 
+void device_free(Device *d) {
+        assert(d);
+
+        device_detach(d);
+
+        hashmap_remove(d->manager->devices, d->sysfs);
+
+        free(d->sysfs);
+        free(d);
+}
+
 void device_attach(Device *d, Seat *s) {
         Device *i;
         bool had_master;