From f9229734501aca189c946479031c2b5e74fb9993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 17 Dec 2021 11:25:37 +0100
Subject: [PATCH] module/battery: handle poll() failures

---
 modules/battery.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/battery.c b/modules/battery.c
index e6526f5..0833310 100644
--- a/modules/battery.c
+++ b/modules/battery.c
@@ -428,7 +428,15 @@ run(struct module *mod)
             {.fd = mod->abort_fd, .events = POLLIN},
             {.fd = udev_monitor_get_fd(mon), .events = POLLIN},
         };
-        poll(fds, 2, m->poll_interval > 0 ? m->poll_interval * 1000 : -1);
+        if (poll(fds, sizeof(fds) / sizeof(fds[0]),
+                 m->poll_interval > 0 ? m->poll_interval * 1000 : -1) < 0)
+        {
+            if (errno == EINTR)
+                continue;
+
+            LOG_ERRNO("failed to poll");
+            break;
+        }
 
         if (fds[0].revents & POLLIN) {
             ret = 0;