From b9422c1fa44b5fc7f9c1083e68a1ad21078d6d12 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 17 Jul 2012 15:23:11 +0900
Subject: [PATCH] --- yaml --- r: 313771 b: refs/heads/master c:
 e3e79454a7c81a5e48c6d6b31068b12936e7d780 h: refs/heads/master i:   313769:
 0e5f1a227f5b9d02aead91ab097ad2a0cde614b4   313767:
 d9eb53c79e5ef4bc086240b7966e34e8e35be121 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/sh/pfc/pinctrl.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dbfa4ce7e1ca..638912b030d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1acbbb4ed846ec6a546834c86a3bd4a5bad4ee4d
+refs/heads/master: e3e79454a7c81a5e48c6d6b31068b12936e7d780
diff --git a/trunk/drivers/sh/pfc/pinctrl.c b/trunk/drivers/sh/pfc/pinctrl.c
index 4eaf24b36a81..e79e379917fc 100644
--- a/trunk/drivers/sh/pfc/pinctrl.c
+++ b/trunk/drivers/sh/pfc/pinctrl.c
@@ -338,6 +338,10 @@ static int __devinit sh_pfc_map_gpios(struct sh_pfc *pfc,
 		pin->number = pfc->first_gpio + i;
 		pin->name = gpio->name;
 
+		/* XXX */
+		if (unlikely(!gpio->enum_id))
+			continue;
+
 		sh_pfc_map_one_gpio(pfc, pmx, gpio, i);
 	}