diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:42:15 +0800 |
| commit | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (patch) | |
| tree | 40270feadd63149bcd43380cf3fe402a2dcd85ad /drivers/pinctrl/bcm/pinctrl-bcm2835.c | |
| parent | 9b17ba5e21b99587d7c54250059cf10fd51c74f2 (diff) | |
| parent | 6fe78bc1bfcddabbf3d210e18f91da44fa796d8a (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.04
Conflicts:
arch/arm/include/asm/psci.h
mm/memcontrol.c
Diffstat (limited to 'drivers/pinctrl/bcm/pinctrl-bcm2835.c')
| -rw-r--r-- | drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 8d908e3f42c3..03ad08ca7e3b 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -786,7 +786,7 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev, } if (num_pulls) { err = of_property_read_u32_index(np, "brcm,pull", - (num_funcs > 1) ? i : 0, &pull); + (num_pulls > 1) ? i : 0, &pull); if (err) goto out; err = bcm2835_pctl_dt_node_to_map_pull(pc, np, pin, |