diff options
| author | Phil Elwell <phil@raspberrypi.org> | 2016-02-29 17:30:08 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 07:33:15 -0700 |
| commit | 9a6d6a47b4e1b661d00f3046d2e2c284fd438118 (patch) | |
| tree | 8d14629284f3cb495d29b0132b11c34a107b77ea | |
| parent | 4b8be5deb9f3c385f193323864610aaf41e9eaa4 (diff) | |
| download | linux-stable-9a6d6a47b4e1b661d00f3046d2e2c284fd438118.tar.gz linux-stable-9a6d6a47b4e1b661d00f3046d2e2c284fd438118.tar.bz2 linux-stable-9a6d6a47b4e1b661d00f3046d2e2c284fd438118.zip | |
pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing
commit 2c7e3306d23864d49f686f22e56e180ff0fffb7f 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>
| -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 0f5997ceb494..08b1d93da9fe 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -779,7 +779,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, |