---

yaml --- r: 362997 b: refs/heads/master c: 175ca83 h: refs/heads/master i: 362995: 9fd7aa1 v: v3
git-mirror · Apr 3, 2013 · 8693693 · 8693693
1 parent 6e4c491
commit 8693693
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -991,6 +991,8 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
 				pinmux_enable_setting(setting);
 		}
 	}
+
+	p->state = old_state;
 	return ret;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -991,6 +991,8 @@ static int pinctrl_select_state_locked(struct pinctrl *p, @@
     				pinmux_enable_setting(setting);
     		}
     	}
+    	p->state = old_state;
     	return ret;
     }
@@ Expand Down @@