From b65d1152f1a2c89ecf20088dbeace9500039d1dc Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 6 Jun 2012 22:50:41 +0200
Subject: [PATCH] --- yaml --- r: 310807 b: refs/heads/master c:
 efec381ced2c0416c3765abce076896cf464dc0c h: refs/heads/master i:   310805:
 d053fa445190faaa7541e2ffd1a920ac1adb812f   310803:
 9e6420d5cdabc2a16737b9b5100b0056dd9dddf7   310799:
 a0304398a265aa215550e341f1e859141d6a393a v: v3

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

diff --git a/[refs] b/[refs]
index 3f06311132f4..a8e47ff76ce5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc66468cee4c23856b2e51d711e62e4ef773001a
+refs/heads/master: efec381ced2c0416c3765abce076896cf464dc0c
diff --git a/trunk/drivers/pinctrl/pinctrl-nomadik.c b/trunk/drivers/pinctrl/pinctrl-nomadik.c
index b26395d16347..ba7122ff480a 100644
--- a/trunk/drivers/pinctrl/pinctrl-nomadik.c
+++ b/trunk/drivers/pinctrl/pinctrl-nomadik.c
@@ -1246,6 +1246,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 		ret = PTR_ERR(clk);
 		goto out_unmap;
 	}
+	clk_prepare(clk);
 
 	nmk_chip = kzalloc(sizeof(*nmk_chip), GFP_KERNEL);
 	if (!nmk_chip) {