diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 17:34:46 +0100 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-11-07 17:34:46 +0100 |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /drivers/gpio/gpio-rcar.c | |
| parent | MIPS: Netlogic: replace early_init_devtree() call (diff) | |
| parent | of/irq: Fix potential buffer overflow (diff) | |
| download | linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.xz linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'drivers/gpio/gpio-rcar.c')
| -rw-r--r-- | drivers/gpio/gpio-rcar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c index e3745eb07570..6038966ab045 100644 --- a/drivers/gpio/gpio-rcar.c +++ b/drivers/gpio/gpio-rcar.c @@ -293,10 +293,9 @@ static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p) if (pdata) { p->config = *pdata; } else if (IS_ENABLED(CONFIG_OF) && np) { - ret = of_parse_phandle_with_args(np, "gpio-ranges", - "#gpio-range-cells", 0, &args); - p->config.number_of_pins = ret == 0 && args.args_count == 3 - ? args.args[2] + ret = of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, + &args); + p->config.number_of_pins = ret == 0 ? args.args[2] : RCAR_MAX_GPIO_PER_BANK; p->config.gpio_base = -1; } |