From: Krzysztof Kozlowski Date: Thu, 6 Dec 2018 09:45:49 +0000 (+0100) Subject: gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB X-Git-Tag: v4.19.88~213 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06f464df98351f823c7c30c489e0e6cf15eb8d77;p=thirdparty%2Fkernel%2Fstable.git gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB [ Upstream commit c5510b8dafce5f3f5a039c9b262ebcae0092c462 ] If CONFIG_GPOILIB is not set, the stub of gpio_to_desc() should return the same type of error as regular version: NULL. All the callers compare the return value of gpio_to_desc() against NULL, so returned ERR_PTR would be treated as non-error case leading to dereferencing of error value. Fixes: 79a9becda894 ("gpiolib: export descriptor-based GPIO interface") Signed-off-by: Krzysztof Kozlowski Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 412098b24f58b..8dfd8300d9c31 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -475,7 +475,7 @@ static inline int gpiod_set_consumer_name(struct gpio_desc *desc, static inline struct gpio_desc *gpio_to_desc(unsigned gpio) { - return ERR_PTR(-EINVAL); + return NULL; } static inline int desc_to_gpio(const struct gpio_desc *desc)