From 9fd7aa1d67902cd1258a79fcf8cd7f397e519e75 Mon Sep 17 00:00:00 2001 From: Richard Genoud Date: Thu, 28 Mar 2013 12:55:46 +0100 Subject: [PATCH] --- yaml --- r: 362995 b: refs/heads/master c: da58751ca2490d5de3a0f7753fd7078c4285c2bc h: refs/heads/master i: 362993: ac864a2aa03183afd06fa36e759eca50747ca275 362991: 66b334b58b56bb8b899987ec330a37b24ecef116 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/core.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 93800ec91732..72416193a7c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 950707c0eb5c7aeaa2c446a04c824f4be686d2f6 +refs/heads/master: da58751ca2490d5de3a0f7753fd7078c4285c2bc diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c index bcec05b5c67e..986d0e02761c 100644 --- a/trunk/drivers/pinctrl/core.c +++ b/trunk/drivers/pinctrl/core.c @@ -956,9 +956,8 @@ static int pinctrl_select_state_locked(struct pinctrl *p, break; } - if (ret < 0) { + if (ret < 0) goto unapply_new_state; - } } p->state = state; @@ -966,7 +965,7 @@ static int pinctrl_select_state_locked(struct pinctrl *p, 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,