Commit 04ee9afb authored by Hans de Goede's avatar Hans de Goede Committed by Martin Pitt

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.
parent d15e95f7
Pipeline #40286 passed with stage
in 5 minutes and 45 seconds
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment