From 26e72370101a7df1949018b978a2bdf82ef8af6c Mon Sep 17 00:00:00 2001 From: Jente Hidskes Date: Mon, 11 Sep 2017 20:19:35 +0200 Subject: [PATCH] RatbagdLed: clamp values instead of returning an error We cannot return error codes, but requesting a resync is overkill. Instead, let's be nice and clamp these values. --- ratbagd/ratbagd-led.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/ratbagd/ratbagd-led.c b/ratbagd/ratbagd-led.c index 5cb2ccbc..75d70026 100644 --- a/ratbagd/ratbagd-led.c +++ b/ratbagd/ratbagd-led.c @@ -131,8 +131,12 @@ static int ratbagd_led_set_color(sd_bus *bus, if (r < 0) return r; - if (c.red > 255 || c.green > 255 || c.blue > 255) - return RATBAG_ERROR_VALUE; + if (c.red > 255) + c.red = 255; + if (c.green > 255) + c.green = 255; + if (c.blue > 255) + c.blue = 255; r = ratbag_led_set_color(led->lib_led, c); @@ -179,8 +183,10 @@ static int ratbagd_led_set_effect_rate(sd_bus *bus, if (r < 0) return r; - if (rate < 100 || rate > 20000) - return 0; + if (rate < 100) + rate = 100; + else if (rate > 20000) + rate = 20000; r = ratbag_led_set_effect_rate(led->lib_led, rate); @@ -228,7 +234,7 @@ static int ratbagd_led_set_brightness(sd_bus *bus, return r; if (brightness > 255) - return 0; + brightness = 255; r = ratbag_led_set_brightness(led->lib_led, brightness);