From d85cdda8f8e57dc3d380b0c3298683e6189d1846 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Sun, 26 Aug 2012 18:00:55 +0200
Subject: [PATCH] --- yaml --- r: 328445 b: refs/heads/master c:
 6ab49f4201676a96f62d0f327206a28dc02f2e2f h: refs/heads/master i:   328443:
 9d8af2601f187e8451b705a68368934449a0304f v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/gpio/gpio-pxa.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 276f80152781..00826dc7f7c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce6b658dc040cf4aa3a30f56115e81d15d91596e
+refs/heads/master: 6ab49f4201676a96f62d0f327206a28dc02f2e2f
diff --git a/trunk/drivers/gpio/gpio-pxa.c b/trunk/drivers/gpio/gpio-pxa.c
index 9cac88a65f78..528de0fa0c9e 100644
--- a/trunk/drivers/gpio/gpio-pxa.c
+++ b/trunk/drivers/gpio/gpio-pxa.c
@@ -620,19 +620,12 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev)
 		iounmap(gpio_reg_base);
 		return PTR_ERR(clk);
 	}
-	ret = clk_prepare(clk);
+	ret = clk_prepare_enable(clk);
 	if (ret) {
 		clk_put(clk);
 		iounmap(gpio_reg_base);
 		return ret;
 	}
-	ret = clk_enable(clk);
-	if (ret) {
-		clk_unprepare(clk);
-		clk_put(clk);
-		iounmap(gpio_reg_base);
-		return ret;
-	}
 
 	/* Initialize GPIO chips */
 	info = dev_get_platdata(&pdev->dev);