From 3d01bfa7db96e0aa6c252078a53f04b6972c94d9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 21 Apr 2023 10:44:43 +0200 Subject: [PATCH] logind-core: drop unneeded check for NULL --- src/login/logind-core.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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); -- 2.47.3