Skip to contentSkip to conversation

Patch "pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing" has been added to the 4.5-stable tree

PATCH [email protected] 1 participant 1 message Apr 9, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
pinctrl-bcm2835-fix-cut-and-paste-error-in-pull-parsing.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 2c7e3306d23864d49f686f22e56e180ff0fffb7f Mon Sep 17 00:00:00 2001

From: Phil Elwell <[email protected]>
Date: Mon, 29 Feb 2016 17:30:08 -0800
Subject: pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing

From: Phil Elwell <[email protected]>

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.

---
 drivers/pinctrl/bcm/pinctrl-bcm2835.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +1 -1
@@ -779,7 +779,7 @@ static int bcm2835_pctl_dt_node_to_map(s
 		}
 		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,

Patches currently in stable-queue which might be from [email protected] are

queue-4.5/pinctrl-bcm2835-fix-cut-and-paste-error-in-pull-parsing.patch