---

yaml --- r: 350480 b: refs/heads/master c: b208306 h: refs/heads/master v: v3
git-mirror · Jan 11, 2013 · 6003eb5 · 6003eb5
1 parent d128fce
commit 6003eb5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e32af889458837d11a1ec5ec98934a1e711b049d
+refs/heads/master: b2083062a3b4035e85349120b426ecef2b6d155f
diff --git a/trunk/drivers/pinctrl/devicetree.c b/trunk/drivers/pinctrl/devicetree.c
@@ -141,6 +141,11 @@ static int dt_to_map_one_config(struct pinctrl *p, const char *statename,
 		pctldev = find_pinctrl_by_of_node(np_pctldev);
 		if (pctldev)
 			break;
+		/* Do not defer probing of hogs (circular loop) */
+		if (np_pctldev == p->dev->of_node) {
+			of_node_put(np_pctldev);
+			return -ENODEV;
+		}
 	}
 	of_node_put(np_pctldev);