From 4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 19:57:32 +0100 Subject: treewide: another round of simplifications Using the same scripts as in f647962d64e "treewide: yet more log_*_errno + return simplifications". --- src/login/logind-button.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/login/logind-button.c') diff --git a/src/login/logind-button.c b/src/login/logind-button.c index 1afb01fc68..e22b106b3c 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -250,10 +250,8 @@ int button_open(Button *b) { p = strappenda("/dev/input/", b->name); b->fd = open(p, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); - if (b->fd < 0) { - log_warning_errno(errno, "Failed to open %s: %m", b->name); - return -errno; - } + if (b->fd < 0) + return log_warning_errno(errno, "Failed to open %s: %m", b->name); if (ioctl(b->fd, EVIOCGNAME(sizeof(name)), name) < 0) { log_error_errno(errno, "Failed to get input name: %m"); -- cgit v1.2.3-54-g00ecf