diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 13:52:44 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 13:52:44 +1100 |
commit | 87cb124813d53fe0df492dfe75b06188f448f8dc (patch) | |
tree | d5a06a82a1b466b6e87aae9c32394b279242212b | |
parent | 3e04ee336824eb83ed7da3a90d664ac9d14ae565 (diff) | |
parent | d2bee67fadb65831837b0282267fb639dd656241 (diff) |
Merge remote-tracking branch 'gpio/for-next'
-rw-r--r-- | drivers/gpio/gpiolib-of.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 8cad8e400b4..4650bf830d6 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); |