---

yaml --- r: 361735 b: refs/heads/master c: 740924a h: refs/heads/master i: 361733: 6753fe1 361731: ba59f00 361727: 4b196b2 v: v3
git-mirror · Mar 21, 2013 · 72bf21e · 72bf21e
1 parent 666965d
commit 72bf21e
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: 48a23fac5eb0030a2d578ee2bde21b6e035b3d57
+refs/heads/master: 740924a267e85de09707ea158bbf594b4d8bae01
diff --git a/trunk/drivers/pinctrl/pinmux.c b/trunk/drivers/pinctrl/pinmux.c
@@ -194,6 +194,11 @@ static const char *pin_free(struct pinctrl_dev *pctldev, int pin,
 	}
 
 	if (!gpio_range) {
+		/*
+		 * A pin should not be freed more times than allocated.
+		 */
+		if (WARN_ON(!desc->mux_usecount))
+			return NULL;
 		desc->mux_usecount--;
 		if (desc->mux_usecount)
 			return NULL;