Skip to content

Commit

Permalink
usb: musb: ux500: use clk_prepare_enable and clk_disable_unprepare
Browse files Browse the repository at this point in the history
This patch converts the module to use clk_prepare_enable and
clk_disable_unprepare variants as required by common clock framework.

Without this the system crash during probe function.

Cc: <stable@vger.kernel.org> # v3.7 v3.8
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Fabio Baltieri authored and Felipe Balbi committed Jan 17, 2013
1 parent f278628 commit 99d17cf
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/usb/musb/ux500.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);

Expand All @@ -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;
}
Expand All @@ -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;
Expand Down

0 comments on commit 99d17cf

Please sign in to comment.