Re: [PATCH stable v4.4+ 3/3] leds: leds-gpio: Fix return value check in create_gpio_led()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Dec 06, 2018 at 10:47:02AM +0100, Krzysztof Kozlowski wrote:
> From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
> 
> 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_wei@xxxxxxxxxxxxxxxxx>
> Signed-off-by: Jacek Anaszewski <j.anaszewski@xxxxxxxxxxx>
> Signed-off-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
> ---
>  drivers/leds/leds-gpio.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

All 3 now queued up, thanks.

greg k-h
> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
> index 5db4515a4fd7..df186b38da78 100644
> --- a/drivers/leds/leds-gpio.c
> +++ b/drivers/leds/leds-gpio.c
> @@ -118,8 +118,8 @@ static int create_gpio_led(const struct gpio_led *template,
>  			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;
> -- 
> 2.7.4
> 



[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux