aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/musb/ux500.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/musb/ux500.c')
-rw-r--r--drivers/usb/musb/ux500.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index a27ca1a9c994..0804661b6d21 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -108,7 +108,7 @@ static int ux500_probe(struct platform_device *pdev)
108 goto err3; 108 goto err3;
109 } 109 }
110 110
111 ret = clk_enable(clk); 111 ret = clk_prepare_enable(clk);
112 if (ret) { 112 if (ret) {
113 dev_err(&pdev->dev, "failed to enable clock\n"); 113 dev_err(&pdev->dev, "failed to enable clock\n");
114 goto err4; 114 goto err4;
@@ -148,7 +148,7 @@ static int ux500_probe(struct platform_device *pdev)
148 return 0; 148 return 0;
149 149
150err5: 150err5:
151 clk_disable(clk); 151 clk_disable_unprepare(clk);
152 152
153err4: 153err4:
154 clk_put(clk); 154 clk_put(clk);
@@ -168,7 +168,7 @@ static int ux500_remove(struct platform_device *pdev)
168 struct ux500_glue *glue = platform_get_drvdata(pdev); 168 struct ux500_glue *glue = platform_get_drvdata(pdev);
169 169
170 platform_device_unregister(glue->musb); 170 platform_device_unregister(glue->musb);
171 clk_disable(glue->clk); 171 clk_disable_unprepare(glue->clk);
172 clk_put(glue->clk); 172 clk_put(glue->clk);
173 kfree(glue); 173 kfree(glue);
174 174
@@ -182,7 +182,7 @@ static int ux500_suspend(struct device *dev)
182 struct musb *musb = glue_to_musb(glue); 182 struct musb *musb = glue_to_musb(glue);
183 183
184 usb_phy_set_suspend(musb->xceiv, 1); 184 usb_phy_set_suspend(musb->xceiv, 1);
185 clk_disable(glue->clk); 185 clk_disable_unprepare(glue->clk);
186 186
187 return 0; 187 return 0;
188} 188}
@@ -193,7 +193,7 @@ static int ux500_resume(struct device *dev)
193 struct musb *musb = glue_to_musb(glue); 193 struct musb *musb = glue_to_musb(glue);
194 int ret; 194 int ret;
195 195
196 ret = clk_enable(glue->clk); 196 ret = clk_prepare_enable(glue->clk);
197 if (ret) { 197 if (ret) {
198 dev_err(dev, "failed to enable clock\n"); 198 dev_err(dev, "failed to enable clock\n");
199 return ret; 199 return ret;