summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2023-04-21 10:44:43 +0200
committerDavid Tardon <dtardon@redhat.com>2023-04-27 21:42:38 +0200
commit3d01bfa7db96e0aa6c252078a53f04b6972c94d9 (patch)
tree3fb914aa40e14bde1dd80bb3e74e0fb8f839babb /src/login
parent737e0f12d926a9aeb1ce5df14ae6bdd12d7eaa35 (diff)
downloadsystemd-3d01bfa7db96e0aa6c252078a53f04b6972c94d9.tar.gz
logind-core: drop unneeded check for NULL
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-core.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 8e1c54dbe2..dd4b246893 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);