lkml.org 
[lkml]   [2015]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 056/175] gpiolib: of: allow of_gpiochip_find_and_xlate to find more than one chip per node
    Date
    From: Hans Holmberg <hans.holmberg@intel.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 9cf75e9e4ddd587ac12e88e8751c358b7b27e95f upstream.

    The change:

    7b8792bbdffdff3abda704f89c6a45ea97afdc62
    gpiolib: of: Correct error handling in of_get_named_gpiod_flags

    assumed that only one gpio-chip is registred per of-node.
    Some drivers register more than one chip per of-node, so
    adjust the matching function of_gpiochip_find_and_xlate to
    not stop looking for chips if a node-match is found and
    the translation fails.

    Fixes: 7b8792bbdffd ("gpiolib: of: Correct error handling in of_get_named_gpiod_flags")
    Signed-off-by: Hans Holmberg <hans.holmberg@intel.com>
    Acked-by: Alexandre Courbot <acourbot@nvidia.com>
    Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
    Tested-by: Tyler Hall <tylerwhall@gmail.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/gpio/gpiolib-of.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
    index 63e7fad69ced..836af49da901 100644
    --- a/drivers/gpio/gpiolib-of.c
    +++ b/drivers/gpio/gpiolib-of.c
    @@ -44,12 +44,13 @@ static int of_gpiochip_find_and_xlate(struct gpio_chip *gc, void *data)

    ret = gc->of_xlate(gc, &gg_data->gpiospec, gg_data->flags);
    if (ret < 0) {
    - /* We've found the gpio chip, but the translation failed.
    - * Return true to stop looking and return the translation
    - * error via out_gpio
    + /* We've found a gpio chip, but the translation failed.
    + * Store translation error in out_gpio.
    + * Return false to keep looking, as more than one gpio chip
    + * could be registered per of-node.
    */
    gg_data->out_gpio = ERR_PTR(ret);
    - return true;
    + return false;
    }

    gg_data->out_gpio = ret + gc->base;
    --
    2.3.0


    \
     
     \ /
      Last update: 2015-03-17 11:01    [W:2.152 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site