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: 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>
This commit is contained in:
Родитель
0762ddd73a
Коммит
2c7e3306d2
|
@ -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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче