4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Wei Yongjun <yongjun_...@trendmicro.com.cn>

commit 2d88a331e48095cf60ad9bdf3177bd401bf99727 upstream.

In case of error, the function gpio_to_desc() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value
check should be replaced with NULL test.

Signed-off-by: Wei Yongjun <yongjun_...@trendmicro.com.cn>
Signed-off-by: Jacek Anaszewski <j.anaszew...@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/leds/leds-gpio.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -118,8 +118,8 @@ static int create_gpio_led(const struct
                        return ret;
 
                led_dat->gpiod = gpio_to_desc(template->gpio);
-               if (IS_ERR(led_dat->gpiod))
-                       return PTR_ERR(led_dat->gpiod);
+               if (!led_dat->gpiod)
+                       return -EINVAL;
        }
 
        led_dat->cdev.name = template->name;


Reply via email to