Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362995
b: refs/heads/master
c: da58751
h: refs/heads/master
i:
  362993: ac864a2
  362991: 66b334b
v: v3
  • Loading branch information
Richard Genoud authored and Linus Walleij committed Apr 3, 2013
1 parent cdb37b9 commit 9fd7aa1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 950707c0eb5c7aeaa2c446a04c824f4be686d2f6
refs/heads/master: da58751ca2490d5de3a0f7753fd7078c4285c2bc
5 changes: 2 additions & 3 deletions trunk/drivers/pinctrl/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -956,17 +956,16 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
break;
}

if (ret < 0) {
if (ret < 0)
goto unapply_new_state;
}
}

p->state = state;

return 0;

unapply_new_state:
pr_info("Error applying setting, reverse things back\n");
dev_err(p->dev, "Error applying setting, reverse things back\n");

/*
* If the loop stopped on the 1st entry, nothing has been enabled,
Expand Down

0 comments on commit 9fd7aa1

Please sign in to comment.