From 86936934ecb32e7f082ff306541611a4298f293c Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Thu, 28 Mar 2013 12:55:48 +0100
Subject: [PATCH] --- yaml --- r: 362997 b: refs/heads/master c:
 175ca83c0b6ab3c2af2d9e1ffff4d274910bbc10 h: refs/heads/master i:   362995:
 9fd7aa1d67902cd1258a79fcf8cd7f397e519e75 v: v3

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

diff --git a/[refs] b/[refs]
index 0d091d0228a1..a07062f4f9ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8009d5ff00df6ad595f2d389f2e32bd4b97aebf5
+refs/heads/master: 175ca83c0b6ab3c2af2d9e1ffff4d274910bbc10
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index f04f7d3d9a94..96cee791aa82 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -991,6 +991,8 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
 				pinmux_enable_setting(setting);
 		}
 	}
+
+	p->state = old_state;
 	return ret;
 }