Skip to content

Commit

Permalink
watchdog: coh901327_wdt: use clk_prepare/unprepare
Browse files Browse the repository at this point in the history
Make sure we prepare/unprepare the COH901327 watchdog timer
as is required by the clk API especially if you use common
clock.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by : Pankaj Jangra <jangra.pankaj9@gmail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Linus Walleij authored and Wim Van Sebroeck committed Jul 23, 2012
1 parent 3017020 commit c362cb5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/watchdog/coh901327_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ static int __exit coh901327_remove(struct platform_device *pdev)
watchdog_unregister_device(&coh901327_wdt);
coh901327_disable();
free_irq(irq, pdev);
clk_unprepare(clk);
clk_put(clk);
iounmap(virtbase);
release_mem_region(phybase, physize);
Expand Down Expand Up @@ -300,9 +301,9 @@ static int __init coh901327_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "could not get clock\n");
goto out_no_clk;
}
ret = clk_enable(clk);
ret = clk_prepare_enable(clk);
if (ret) {
dev_err(&pdev->dev, "could not enable clock\n");
dev_err(&pdev->dev, "could not prepare and enable clock\n");
goto out_no_clk_enable;
}

Expand Down Expand Up @@ -369,7 +370,7 @@ static int __init coh901327_probe(struct platform_device *pdev)
out_no_wdog:
free_irq(irq, pdev);
out_no_irq:
clk_disable(clk);
clk_disable_unprepare(clk);
out_no_clk_enable:
clk_put(clk);
out_no_clk:
Expand Down

0 comments on commit c362cb5

Please sign in to comment.