summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2019-05-20 19:34:19 +0200
committerMartin Pitt <martin@piware.de>2019-06-04 07:16:59 +0000
commit04ee9afb58db5e9c4a9c7341a58ad729f261d229 (patch)
tree4471f94a5549856093c1ac84171178a26cc0dde9
parentd15e95f785b21be3ca45e9e2cc7143779c0b5176 (diff)
UpKbdBacklight: Fix endless loop burning 100% CPU on keyboard plugout
If an external keyboard with a backlight gets unplugged then up_kbd_backlight_event_io would constantly get called, burning 100% CPU. To make things worse, up_kbd_backlight_event_io would also constantly post DBUS events, causing gnome-shell to also become very unresponsive. This commit fixes this by returning FALSE from up_kbd_backlight_event_io on unplug. While at it also fix calling up_kbd_backlight_emit_change with a negative brightness value in other error scenarios. Specifically this fixes calling up_kbd_backlight_emit_change with -1 on the initial up_kbd_backlight_event_io call in which case up_kbd_backlight_brightness_read will typically fail with ENODATA.
-rw-r--r--src/up-kbd-backlight.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/up-kbd-backlight.c b/src/up-kbd-backlight.c
index 405fcff..f9663e7 100644
--- a/src/up-kbd-backlight.c
+++ b/src/up-kbd-backlight.c
@@ -31,6 +31,7 @@
#include <unistd.h>
#include <string.h>
#include <dirent.h>
+#include <errno.h>
#include "up-kbd-backlight.h"
#include "up-daemon.h"
@@ -220,7 +221,11 @@ up_kbd_backlight_event_io (GIOChannel *channel, GIOCondition condition, gpointer
return FALSE;
brightness = up_kbd_backlight_brightness_read (kbd_backlight, kbd_backlight->priv->fd_hw_changed);
- up_kbd_backlight_emit_change (kbd_backlight, brightness, "internal");
+ if (brightness < 0 && errno == ENODEV)
+ return FALSE;
+
+ if (brightness >= 0)
+ up_kbd_backlight_emit_change (kbd_backlight, brightness, "internal");
return TRUE;
}