iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing

Browse Source 
commit 2c7e3306d2 upstream.

The DT bindings for pinctrl-bcm2835 allow both the function and pull
to contain either one entry or one per pin. However, an error in the
DT parsing can cause failures if the number of pulls differs from the
number of functions.

Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
Reviewed-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Phil Elwell
2016-02-29 17:30:08 -08:00
committed by Greg Kroah-Hartman
parent c1948606af
commit 88c9954c5c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/bcm/pinctrl-bcm2835.c
View File

@ -779,7 +779,7 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev,
} }
if (num_pulls) { if (num_pulls) {
err = of_property_read_u32_index(np, "brcm,pull", err = of_property_read_u32_index(np, "brcm,pull",
(num_funcs > 1) ? i : 0, &pull); (num_pulls > 1) ? i : 0, &pull);
if (err) if (err)
goto out; goto out;
err = bcm2835_pctl_dt_node_to_map_pull(pc, np, pin, err = bcm2835_pctl_dt_node_to_map_pull(pc, np, pin,