Skip to content

Commit

Permalink
staging: omap-thermal: update clock prepare count
Browse files Browse the repository at this point in the history
This patch changes the clock management code to also update
the clock prepare counter, this way we won't skip the enable/disable
operation due to prepare dependencies.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Eduardo Valentin authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent 687ad31 commit f1d07f3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/omap-thermal/omap-bandgap.c
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ int omap_bandgap_probe(struct platform_device *pdev)

bg_ptr->clk_rate = clk_rate;
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_enable(bg_ptr->fclock);
clk_prepare_enable(bg_ptr->fclock);


mutex_init(&bg_ptr->bg_mutex);
Expand Down Expand Up @@ -1013,7 +1013,7 @@ int omap_bandgap_probe(struct platform_device *pdev)

disable_clk:
if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_disable(bg_ptr->fclock);
clk_disable_unprepare(bg_ptr->fclock);
put_clks:
clk_put(bg_ptr->fclock);
clk_put(bg_ptr->div_clk);
Expand Down Expand Up @@ -1044,7 +1044,7 @@ int omap_bandgap_remove(struct platform_device *pdev)
omap_bandgap_power(bg_ptr, false);

if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_disable(bg_ptr->fclock);
clk_disable_unprepare(bg_ptr->fclock);
clk_put(bg_ptr->fclock);
clk_put(bg_ptr->div_clk);

Expand Down Expand Up @@ -1143,7 +1143,7 @@ static int omap_bandgap_suspend(struct device *dev)
omap_bandgap_power(bg_ptr, false);

if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_disable(bg_ptr->fclock);
clk_disable_unprepare(bg_ptr->fclock);

return err;
}
Expand All @@ -1153,7 +1153,7 @@ static int omap_bandgap_resume(struct device *dev)
struct omap_bandgap *bg_ptr = dev_get_drvdata(dev);

if (OMAP_BANDGAP_HAS(bg_ptr, CLK_CTRL))
clk_enable(bg_ptr->fclock);
clk_prepare_enable(bg_ptr->fclock);

omap_bandgap_power(bg_ptr, true);

Expand Down

0 comments on commit f1d07f3

Please sign in to comment.