From ae654c143923eb0bc2a16b632e32f2d3880a0f67 Mon Sep 17 00:00:00 2001
From: Richard Genoud <richard.genoud@gmail.com>
Date: Fri, 10 Aug 2012 16:53:49 +0200
Subject: [PATCH] --- yaml --- r: 321951 b: refs/heads/master c:
 d599bfb324ad74e63b616809c1c13c76d1493cf9 h: refs/heads/master i:   321949:
 1b40b6e36d41c7ee7b970574432b23af06cb798e   321947:
 f60459297b383d671ff850fb38801fee438e1d94   321943:
 1cf6bbb2a8ada27aba228ae770febb2456a51ca6   321935:
 a5e57bf9660ac810ead3df8edbb882c7a81ce833   321919:
 e83eab381a2c575fe659e4ea6400f59669bd2d46 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/pinctrl/core.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 431232c2ee28..c57dd4047e2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac5aa7f9e0891a115ab307b4bdde9c55b9232970
+refs/heads/master: d599bfb324ad74e63b616809c1c13c76d1493cf9
diff --git a/trunk/drivers/pinctrl/core.c b/trunk/drivers/pinctrl/core.c
index fb7f3bebdc69..dc5c126e398a 100644
--- a/trunk/drivers/pinctrl/core.c
+++ b/trunk/drivers/pinctrl/core.c
@@ -657,11 +657,7 @@ static struct pinctrl *pinctrl_get_locked(struct device *dev)
 	if (p != NULL)
 		return ERR_PTR(-EBUSY);
 
-	p = create_pinctrl(dev);
-	if (IS_ERR(p))
-		return p;
-
-	return p;
+	return create_pinctrl(dev);
 }
 
 /**
@@ -738,11 +734,8 @@ static struct pinctrl_state *pinctrl_lookup_state_locked(struct pinctrl *p,
 			dev_dbg(p->dev, "using pinctrl dummy state (%s)\n",
 				name);
 			state = create_state(p, name);
-			if (IS_ERR(state))
-				return state;
-		} else {
-			return ERR_PTR(-ENODEV);
-		}
+		} else
+			state = ERR_PTR(-ENODEV);
 	}
 
 	return state;