From: David Tardon <dtardon@redhat.com>
Date: Fri, 21 Apr 2023 08:44:43 +0000 (+0200)
Subject: logind-core: drop unneeded check for NULL
X-Git-Tag: v254-rc1~603^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d01bfa7db96e0aa6c252078a53f04b6972c94d9;p=thirdparty%2Fsystemd.git

logind-core: drop unneeded check for NULL
---

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 8e1c54dbe20..dd4b246893c 100644
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -323,15 +323,11 @@ int manager_process_button_device(Manager *m, sd_device *d) {
                 return r;
 
         if (device_for_action(d, SD_DEVICE_REMOVE) ||
-            sd_device_has_current_tag(d, "power-switch") <= 0) {
+            sd_device_has_current_tag(d, "power-switch") <= 0)
 
-                b = hashmap_get(m->buttons, sysname);
-                if (!b)
-                        return 0;
-
-                button_free(b);
+                button_free(hashmap_get(m->buttons, sysname));
 
-        } else {
+        else {
                 const char *sn;
 
                 r = manager_add_button(m, sysname, &b);