|
@@ -1833,7 +1833,7 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
|
|
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
|
|
r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
|
|
|
|
|
|
if (r8a66597->pdata->on_chip) {
|
|
if (r8a66597->pdata->on_chip) {
|
|
- clk_disable(r8a66597->clk);
|
|
|
|
|
|
+ clk_disable_unprepare(r8a66597->clk);
|
|
clk_put(r8a66597->clk);
|
|
clk_put(r8a66597->clk);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1931,7 +1931,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
|
|
ret = PTR_ERR(r8a66597->clk);
|
|
ret = PTR_ERR(r8a66597->clk);
|
|
goto clean_up;
|
|
goto clean_up;
|
|
}
|
|
}
|
|
- clk_enable(r8a66597->clk);
|
|
|
|
|
|
+ clk_prepare_enable(r8a66597->clk);
|
|
}
|
|
}
|
|
|
|
|
|
if (r8a66597->pdata->sudmac) {
|
|
if (r8a66597->pdata->sudmac) {
|
|
@@ -1996,7 +1996,7 @@ clean_up3:
|
|
free_irq(irq, r8a66597);
|
|
free_irq(irq, r8a66597);
|
|
clean_up2:
|
|
clean_up2:
|
|
if (r8a66597->pdata->on_chip) {
|
|
if (r8a66597->pdata->on_chip) {
|
|
- clk_disable(r8a66597->clk);
|
|
|
|
|
|
+ clk_disable_unprepare(r8a66597->clk);
|
|
clk_put(r8a66597->clk);
|
|
clk_put(r8a66597->clk);
|
|
}
|
|
}
|
|
clean_up:
|
|
clean_up:
|