From e2ac5020ca2757f70d862c1108aaf8a48abf2373 Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Wed, 14 Nov 2012 14:44:07 +0530
Subject: [PATCH] --- yaml --- r: 336423 b: refs/heads/master c:
 f92bc45ffdcd28c41bb6861753deb1a68d857922 h: refs/heads/master i:   336421:
 1ca1887e673189d7239666061a8f4ec3c047da21   336419:
 5d5c762426a6d196b6fbaf52516eb43c2c7f5bea   336415:
 939191060dd1ebd69b046d8ebdfa21c46fd91543 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/pinctrl/spear/pinctrl-plgpio.c | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1e4251777740..d49d24e7e729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9804049097af11b4f64a82b0e8c8078b3f2cbada
+refs/heads/master: f92bc45ffdcd28c41bb6861753deb1a68d857922
diff --git a/trunk/drivers/pinctrl/spear/pinctrl-plgpio.c b/trunk/drivers/pinctrl/spear/pinctrl-plgpio.c
index cf6d9c204936..5aebbf780fb5 100644
--- a/trunk/drivers/pinctrl/spear/pinctrl-plgpio.c
+++ b/trunk/drivers/pinctrl/spear/pinctrl-plgpio.c
@@ -213,7 +213,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
 		return ret;
 
 	if (!IS_ERR(plgpio->clk)) {
-		ret = clk_prepare_enable(plgpio->clk);
+		ret = clk_enable(plgpio->clk);
 		if (ret)
 			goto err0;
 	}
@@ -244,7 +244,7 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
 
 err1:
 	if (!IS_ERR(plgpio->clk))
-		clk_disable_unprepare(plgpio->clk);
+		clk_disable(plgpio->clk);
 err0:
 	pinctrl_free_gpio(gpio);
 	return ret;
@@ -275,7 +275,7 @@ static void plgpio_free(struct gpio_chip *chip, unsigned offset)
 
 disable_clk:
 	if (!IS_ERR(plgpio->clk))
-		clk_disable_unprepare(plgpio->clk);
+		clk_disable(plgpio->clk);
 
 	pinctrl_free_gpio(gpio);
 }
@@ -584,10 +584,18 @@ static int __devinit plgpio_probe(struct platform_device *pdev)
 	plgpio->chip.dev = &pdev->dev;
 	plgpio->chip.owner = THIS_MODULE;
 
+	if (!IS_ERR(plgpio->clk)) {
+		ret = clk_prepare(plgpio->clk);
+		if (ret) {
+			dev_err(&pdev->dev, "clk prepare failed\n");
+			return ret;
+		}
+	}
+
 	ret = gpiochip_add(&plgpio->chip);
 	if (ret) {
 		dev_err(&pdev->dev, "unable to add gpio chip\n");
-		return ret;
+		goto unprepare_clk;
 	}
 
 	irq = platform_get_irq(pdev, 0);
@@ -629,6 +637,9 @@ static int __devinit plgpio_probe(struct platform_device *pdev)
 	dev_info(&pdev->dev, "Remove gpiochip\n");
 	if (gpiochip_remove(&plgpio->chip))
 		dev_err(&pdev->dev, "unable to remove gpiochip\n");
+unprepare_clk:
+	if (!IS_ERR(plgpio->clk))
+		clk_unprepare(plgpio->clk);
 
 	return ret;
 }