From 72bf21e8f129566d3ce323f623448c3a77633b86 Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Thu, 21 Mar 2013 12:21:47 +0100
Subject: [PATCH] --- yaml --- r: 361735 b: refs/heads/master c:
 740924a267e85de09707ea158bbf594b4d8bae01 h: refs/heads/master i:   361733:
 6753fe1ac1090be7602068e8f9ccf40f791c808d   361731:
 ba59f00bfaed5f99c732be69c10e47c44fc09789   361727:
 4b196b28767f11041fded3a7df89f226bb9fd4e7 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/pinctrl/pinmux.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9882b265b53a..676f2e308264 100644
--- 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
index 1a00658b3ea0..bd83c8b01cd1 100644
--- 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;