Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c7e3306 authored by Phil Elwell's avatar Phil Elwell Committed by Linus Walleij
Browse files

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



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.

Cc: stable@vger.kernel.org
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>
parent 0762ddd7

drivers/pinctrl/bcm/pinctrl-bcm2835.c

+1 −1
Original line number Diff line number Diff line
@@ -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,