diff options
| author | Krzysztof Kozlowski <krzk@kernel.org> | 2018-12-06 10:45:49 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2019-04-04 16:13:49 +0100 |
| commit | a3777d9cafa6742063a6e3b0e4cf6d62b26910be (patch) | |
| tree | 3720e72907d81e1fcd9ebd2b776af7698d898526 /include | |
| parent | e6f592986433f9b3ef79ab5c2197b9badac370f4 (diff) | |
| download | linux-stable-a3777d9cafa6742063a6e3b0e4cf6d62b26910be.tar.gz | |
gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB
commit c5510b8dafce5f3f5a039c9b262ebcae0092c462 upstream.
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 <krzk@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/gpio/consumer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index 05e53ccb708b39..0b2aaf47b5ac2b 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -245,7 +245,7 @@ static inline int gpiod_to_irq(const 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) { |