From 4e118d18d22704baf557a0450f5d8cb266738e4a Mon Sep 17 00:00:00 2001
From: Fabio Baltieri <fabio.baltieri@linaro.org>
Date: Mon, 7 Jan 2013 17:47:41 +0100
Subject: [PATCH] --- yaml --- r: 354591 b: refs/heads/master c:
 99d17cfa3bbc6f4edb175f819af59c6b9e245e82 h: refs/heads/master i:   354589:
 b738de792d6b80e46f22148ac1e2d5d92406166f   354587:
 990a82869c2bad7ec6a37d620045340faf795476   354583:
 5b9044e644b24f180fc66e41baac9d33e6d9683b   354575:
 ac9e4edd3e19df53d14e321adcb74ffcd27cb122   354559:
 9c74971874c8c6b438a25c0116caaf8fe091f2bb v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/usb/musb/ux500.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a2dc67dc8c9a..5b66fb3c45b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f27862819350d2c1a679b690b5b3559e632e81eb
+refs/heads/master: 99d17cfa3bbc6f4edb175f819af59c6b9e245e82
diff --git a/trunk/drivers/usb/musb/ux500.c b/trunk/drivers/usb/musb/ux500.c
index a27ca1a9c994..0804661b6d21 100644
--- a/trunk/drivers/usb/musb/ux500.c
+++ b/trunk/drivers/usb/musb/ux500.c
@@ -108,7 +108,7 @@ static int ux500_probe(struct platform_device *pdev)
 		goto err3;
 	}
 
-	ret = clk_enable(clk);
+	ret = clk_prepare_enable(clk);
 	if (ret) {
 		dev_err(&pdev->dev, "failed to enable clock\n");
 		goto err4;
@@ -148,7 +148,7 @@ static int ux500_probe(struct platform_device *pdev)
 	return 0;
 
 err5:
-	clk_disable(clk);
+	clk_disable_unprepare(clk);
 
 err4:
 	clk_put(clk);
@@ -168,7 +168,7 @@ static int ux500_remove(struct platform_device *pdev)
 	struct ux500_glue	*glue = platform_get_drvdata(pdev);
 
 	platform_device_unregister(glue->musb);
-	clk_disable(glue->clk);
+	clk_disable_unprepare(glue->clk);
 	clk_put(glue->clk);
 	kfree(glue);
 
@@ -182,7 +182,7 @@ static int ux500_suspend(struct device *dev)
 	struct musb		*musb = glue_to_musb(glue);
 
 	usb_phy_set_suspend(musb->xceiv, 1);
-	clk_disable(glue->clk);
+	clk_disable_unprepare(glue->clk);
 
 	return 0;
 }
@@ -193,7 +193,7 @@ static int ux500_resume(struct device *dev)
 	struct musb		*musb = glue_to_musb(glue);
 	int			ret;
 
-	ret = clk_enable(glue->clk);
+	ret = clk_prepare_enable(glue->clk);
 	if (ret) {
 		dev_err(dev, "failed to enable clock\n");
 		return ret;