diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2016-09-14 20:54:31 +0200 |
|---|---|---|
| committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2016-09-15 16:49:40 +0200 |
| commit | 061b5c1d013a94af385ba8980ea3b2617f1ff0f6 (patch) | |
| tree | f11437e438094356e0a29069183df9c5bf52b6ac /drivers/leds | |
| parent | leds: gpio: introduce gpio_blink_set_t (diff) | |
| download | linux-061b5c1d013a94af385ba8980ea3b2617f1ff0f6.tar.xz linux-061b5c1d013a94af385ba8980ea3b2617f1ff0f6.zip | |
leds: gpio: fix an unhandled error case in create_gpio_led
gpiod_get_value_cansleep returns 0, 1, or an error code.
So far errors are not handled and treated the same as 1.
Change this to bail out if an error code is returned and
remove the double negation.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-gpio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 3599b2e4977c..10c851ecc6ce 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -118,10 +118,13 @@ static int create_gpio_led(const struct gpio_led *template, led_dat->platform_gpio_blink_set = blink_set; led_dat->cdev.blink_set = gpio_blink_set; } - if (template->default_state == LEDS_GPIO_DEFSTATE_KEEP) - state = !!gpiod_get_value_cansleep(led_dat->gpiod); - else + if (template->default_state == LEDS_GPIO_DEFSTATE_KEEP) { + state = gpiod_get_value_cansleep(led_dat->gpiod); + if (state < 0) + return state; + } else { state = (template->default_state == LEDS_GPIO_DEFSTATE_ON); + } led_dat->cdev.brightness = state ? LED_FULL : LED_OFF; if (!template->retain_state_suspended) led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME; |