Merge commit 'who/for-keith'

Skipping two unreviewed patches; will mark them reviewed and cherry pick

1 files changed, 2 insertions, 4 deletions

diff --git a/config/config.c b/config/config.c
index def7f16ca..551451623 100644
--- a/config/config.c
+++ b/config/config.c
@@ -250,8 +250,6 @@ config_odev_free_attributes(struct OdevAttributes *attribs)
         free(iter);
     }
 
-    if (fd != -1) {
-        systemd_logind_release_fd(major, minor);
-        close(fd);
-    }
+    if (fd != -1)
+        systemd_logind_release_fd(major, minor, fd);
 }