| Message ID | 1423558107-23264-1-git-send-email-hans.holmberg@intel.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <hans.holmberg@intel.com> wrote: > 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. > > Signed-off-by: Hans Holmberg <hans.holmberg@intel.com> Acked-by: Alexandre Courbot <acourbot@nvidia.com> Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Alexandre Courbot <gnurou@gmail.com> writes: > On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <hans.holmberg@intel.com> wrote: >> 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. >> >> Signed-off-by: Hans Holmberg <hans.holmberg@intel.com> > > Acked-by: Alexandre Courbot <acourbot@nvidia.com> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> (on arm pxa architecture) Cheers.
On Tue, Feb 10, 2015 at 12:08 PM, Robert Jarzmik <robert.jarzmik@free.fr> wrote: > Alexandre Courbot <gnurou@gmail.com> writes: > >> On Tue, Feb 10, 2015 at 5:48 PM, Hans Holmberg <hans.holmberg@intel.com> wrote: >>> 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. >>> >>> Signed-off-by: Hans Holmberg <hans.holmberg@intel.com> >> >> Acked-by: Alexandre Courbot <acourbot@nvidia.com> > Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> > (on arm pxa architecture) Tested-by: Tyler Hall <tylerwhall@gmail.com> With gpio-pxa (multiple chips per of node) and on arm-mvebu with mvebu-gpio (one chip per of-node). -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 10, 2015 at 9:48 AM, Hans Holmberg <hans.holmberg@intel.com> wrote: > 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. > > Signed-off-by: Hans Holmberg <hans.holmberg@intel.com> OK this patch applied for stable and pushed for testing in -next. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 08261f2..26645a8 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -46,12 +46,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 = gpiochip_get_desc(gc, ret);
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. Signed-off-by: Hans Holmberg <hans.holmberg@intel.com> --- drivers/gpio/gpiolib-of.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)