Commit 9a6d6a47 authored by Phil Elwell's avatar Phil Elwell Committed by Greg Kroah-Hartman

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

commit 2c7e3306 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: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarPhil Elwell <phil@raspberrypi.org>
Reviewed-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b8be5de
...@@ -779,7 +779,7 @@ static int bcm2835_pctl_dt_node_to_map(struct pinctrl_dev *pctldev, ...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment