1 From 5e3168449aa5a105df7043bfeb425b4dd929dea6 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Tue, 9 Feb 2016 09:52:13 +0000
4 Subject: [PATCH 143/232] pinctrl-bcm2835: Fix cut-and-paste error in "pull"
7 The DT bindings for pinctrl-bcm2835 allow both the function and pull
8 to contain either one entry or one per pin. However, an error in the
9 DT parsing can cause failures if the number of pulls differs from the
12 drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
15 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
16 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
17 @@ -802,7 +802,7 @@ static int bcm2835_pctl_dt_node_to_map(s
20 err = of_property_read_u32_index(np, "brcm,pull",
21 - (num_funcs > 1) ? i : 0, &pull);
22 + (num_pulls > 1) ? i : 0, &pull);
25 err = bcm2835_pctl_dt_node_to_map_pull(pc, np, pin,