From 666965ddf4573e5aec888dcab778e3672b1960e7 Mon Sep 17 00:00:00 2001
From: Simon Guinot <simon.guinot@sequanux.org>
Date: Tue, 19 Mar 2013 20:07:42 +0100
Subject: [PATCH] --- yaml --- r: 361734 b: refs/heads/master c:
 48a23fac5eb0030a2d578ee2bde21b6e035b3d57 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a23010d7da61..9882b265b53a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf4d7be57ba9040347065f48a60f895a254f6e28
+refs/heads/master: 48a23fac5eb0030a2d578ee2bde21b6e035b3d57
diff --git a/trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index c689c04a4f52..2d2f0a43d36b 100644
--- a/trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -620,7 +620,7 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
 
 		/* special soc specific control */
 		if (ctrl->mpp_get || ctrl->mpp_set) {
-			if (!ctrl->name || !ctrl->mpp_set || !ctrl->mpp_set) {
+			if (!ctrl->name || !ctrl->mpp_get || !ctrl->mpp_set) {
 				dev_err(&pdev->dev, "wrong soc control info\n");
 				return -EINVAL;
 			}