| From 13cb6eb372f28c0b86b2442473fd15e4ac14d782 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Wed, 25 Jan 2017 23:22:36 +0100 |
| Subject: [PATCH] leds: ktd2692: avoid harmless maybe-uninitialized warning |
| |
| commit cbe99c538d1776009e8710755bb6e726f7fffa9b upstream. |
| |
| gcc gets confused about the control flow in ktd2692_parse_dt(), causing |
| it to warn about what seems like a potential bug: |
| |
| drivers/leds/leds-ktd2692.c: In function 'ktd2692_probe': |
| drivers/leds/leds-ktd2692.c:244:15: error: '*((void *)&led_cfg+8)' may be used uninitialized in this function [-Werror=maybe-uninitialized] |
| drivers/leds/leds-ktd2692.c:225:7: error: 'led_cfg.flash_max_microamp' may be used uninitialized in this function [-Werror=maybe-uninitialized] |
| drivers/leds/leds-ktd2692.c:232:3: error: 'led_cfg.movie_max_microamp' may be used uninitialized in this function [-Werror=maybe-uninitialized] |
| |
| The code is fine, and slightly reworking it in an equivalent way lets |
| gcc figure that out too, which gets rid of the warning. |
| |
| Fixes: 77e7915b15bb ("leds: ktd2692: Add missing of_node_put") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Acked-by: Pavel Machek <pavel@ucw.cz> |
| Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/leds/leds-ktd2692.c b/drivers/leds/leds-ktd2692.c |
| index bf23ba191ad0..45296aaca9da 100644 |
| --- a/drivers/leds/leds-ktd2692.c |
| +++ b/drivers/leds/leds-ktd2692.c |
| @@ -270,15 +270,15 @@ static int ktd2692_parse_dt(struct ktd2692_context *led, struct device *dev, |
| return -ENXIO; |
| |
| led->ctrl_gpio = devm_gpiod_get(dev, "ctrl", GPIOD_ASIS); |
| - if (IS_ERR(led->ctrl_gpio)) { |
| - ret = PTR_ERR(led->ctrl_gpio); |
| + ret = PTR_ERR_OR_ZERO(led->ctrl_gpio); |
| + if (ret) { |
| dev_err(dev, "cannot get ctrl-gpios %d\n", ret); |
| return ret; |
| } |
| |
| led->aux_gpio = devm_gpiod_get(dev, "aux", GPIOD_ASIS); |
| - if (IS_ERR(led->aux_gpio)) { |
| - ret = PTR_ERR(led->aux_gpio); |
| + ret = PTR_ERR_OR_ZERO(led->aux_gpio); |
| + if (ret) { |
| dev_err(dev, "cannot get aux-gpios %d\n", ret); |
| return ret; |
| } |
| -- |
| 2.12.0 |
| |
