forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent

Browse source
This commit is contained in:
Paul Mundt 2010-11-10 18:15:44 +09:00
commit 8ac5ba61cb
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/rtc/rtc-sh.c
View file

@ -761,7 +761,7 @@ err_unmap:
clk_put(rtc->clk); clk_put(rtc->clk);
iounmap(rtc->regbase); iounmap(rtc->regbase);
err_badmap: err_badmap:
release_resource(rtc->res); release_mem_region(rtc->res->start, rtc->regsize);
err_badres: err_badres:
kfree(rtc); kfree(rtc);
@ -786,7 +786,7 @@ static int __exit sh_rtc_remove(struct platform_device *pdev)
} }
iounmap(rtc->regbase); iounmap(rtc->regbase);
release_resource(rtc->res); release_mem_region(rtc->res->start, rtc->regsize);
clk_disable(rtc->clk); clk_disable(rtc->clk);
clk_put(rtc->clk); clk_put(rtc->clk);

4
drivers/sh/clk/core.c
View file

@ -571,7 +571,7 @@ long clk_round_parent(struct clk *clk, unsigned long target,
*best_freq = freq_max; *best_freq = freq_max;
} }
pr_debug("too low freq %lu, error %lu\n", freq->frequency, pr_debug("too low freq %u, error %lu\n", freq->frequency,
target - freq_max); target - freq_max);
if (!error) if (!error)
@ -591,7 +591,7 @@ long clk_round_parent(struct clk *clk, unsigned long target,
*best_freq = freq_min; *best_freq = freq_min;
} }
pr_debug("too high freq %lu, error %lu\n", freq->frequency, pr_debug("too high freq %u, error %lu\n", freq->frequency,
freq_min - target); freq_min - target);
if (!error) if (!error)