From 40ddcaf15e5da706de33981a7e9d21f2029a0437 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Tue, 13 Nov 2012 09:00:07 +0800
Subject: [PATCH] --- yaml --- r: 336418 b: refs/heads/master c:
 8d1c6ef67a4530ee5dbd5038d2959a54593013b1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 450bb65a7b65..c4a27ca49f5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 102caad905d919cc981f8ce799e5a63b6889b979
+refs/heads/master: 8d1c6ef67a4530ee5dbd5038d2959a54593013b1
diff --git a/trunk/drivers/pinctrl/pinctrl-imx.c b/trunk/drivers/pinctrl/pinctrl-imx.c
index f3d2384b34bf..525a2c8644f6 100644
--- a/trunk/drivers/pinctrl/pinctrl-imx.c
+++ b/trunk/drivers/pinctrl/pinctrl-imx.c
@@ -71,7 +71,7 @@ static const struct imx_pin_reg *imx_find_pin_reg(
 			break;
 	}
 
-	if (!pin_reg) {
+	if (i == info->npin_regs) {
 		dev_err(info->dev, "Pin(%s): unable to find pin reg map\n",
 			info->pins[pin].name);
 		return NULL;