xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.12-rc4' into devel

Browse Source 
Linux 3.12-rc4
This commit is contained in:
Linus Walleij
2013-10-16 10:05:53 +02:00
parent 873ee9ed2c d0e639c9e0
commit 263c43a447
940 changed files with 9191 additions and 5233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpio/gpio-rcar.c
View File

@@ -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;
}