diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-03-15 02:16:28 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-03-15 02:16:28 -0400 |
| commit | 47f4e0c1c87f34bf1fc74b8935a37d229a147946 (patch) | |
| tree | 29c7fe96a5dbc8870e75ecbb027e39682a5fcbab /drivers/gpio | |
| parent | a9324f6b8394ef514098ded280e7017b4204fb90 (diff) | |
| parent | bf4d7be57ba9040347065f48a60f895a254f6e28 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into pinmux-base
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib-of.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 892040ad0095..465f4ca57e80 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c | |||
| @@ -193,7 +193,7 @@ static void of_gpiochip_add_pin_range(struct gpio_chip *chip) | |||
| 193 | if (!np) | 193 | if (!np) |
| 194 | return; | 194 | return; |
| 195 | 195 | ||
| 196 | do { | 196 | for (;; index++) { |
| 197 | ret = of_parse_phandle_with_args(np, "gpio-ranges", | 197 | ret = of_parse_phandle_with_args(np, "gpio-ranges", |
| 198 | "#gpio-range-cells", index, &pinspec); | 198 | "#gpio-range-cells", index, &pinspec); |
| 199 | if (ret) | 199 | if (ret) |
| @@ -211,8 +211,7 @@ static void of_gpiochip_add_pin_range(struct gpio_chip *chip) | |||
| 211 | 211 | ||
| 212 | if (ret) | 212 | if (ret) |
| 213 | break; | 213 | break; |
| 214 | 214 | } | |
| 215 | } while (index++); | ||
| 216 | } | 215 | } |
| 217 | 216 | ||
| 218 | #else | 217 | #else |