diff options
| author | Krzysztof Kozlowski <krzk@kernel.org> | 2018-12-06 10:45:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-05 09:20:15 +0100 |
| commit | 06f464df98351f823c7c30c489e0e6cf15eb8d77 (patch) | |
| tree | d56dea7836b31fce896a4102e412c4a4128fd89d /include/linux | |
| parent | fc3df7cb3e1f5e220a84cae3b184921d5fdbbd6f (diff) | |
| download | linux-stable-06f464df98351f823c7c30c489e0e6cf15eb8d77.tar.gz linux-stable-06f464df98351f823c7c30c489e0e6cf15eb8d77.tar.bz2 linux-stable-06f464df98351f823c7c30c489e0e6cf15eb8d77.zip | |
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 <krzk@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
| -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 412098b24f58..8dfd8300d9c3 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) |