---

yaml --- r: 362996 b: refs/heads/master c: 8009d5f h: refs/heads/master v: v3
git-mirror · Apr 3, 2013 · 6e4c491 · 6e4c491
1 parent 9fd7aa1
commit 6e4c491
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da58751ca2490d5de3a0f7753fd7078c4285c2bc
+refs/heads/master: 8009d5ff00df6ad595f2d389f2e32bd4b97aebf5
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
@@ -967,20 +967,12 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
 unapply_new_state:
 	dev_err(p->dev, "Error applying setting, reverse things back\n");
 
-	/*
-	 * If the loop stopped on the 1st entry, nothing has been enabled,
-	 * so jump directly to the 2nd phase
-	 */
-	if (list_entry(&setting->node, typeof(*setting), node) ==
-	    list_first_entry(&state->settings, typeof(*setting), node))
-		goto reapply_old_state;
-
 	list_for_each_entry(setting2, &state->settings, node) {
 		if (&setting2->node == &setting->node)
 			break;
 		pinctrl_free_setting(true, setting2);
 	}
-reapply_old_state:
+
 	if (old_state) {
 		list_for_each_entry(setting, &old_state->settings, node) {
 			bool found = false;