lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 110/321] gpiolib: Fix return value of gpio_to_desc() stub if !GPIOLIB
    Date
    From: Krzysztof Kozlowski <krzk@kernel.org>

    [ 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>
    ---
    include/linux/gpio/consumer.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    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)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-03 23:51    [W:4.272 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site