diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
| commit | cfb13c5db08c90311a5defdde9a0328ee788cca5 (patch) | |
| tree | 842cb60d1d19b99e550fdbc653723e4b13e51ee5 /drivers/rtc/rtc-sh.c | |
| parent | 4b6ba8aacbb3185703b797286547d0f8f3859b02 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'drivers/rtc/rtc-sh.c')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 5efbd5990ff8..06e41ed93230 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
| @@ -761,7 +761,7 @@ err_unmap: | |||
| 761 | clk_put(rtc->clk); | 761 | clk_put(rtc->clk); |
| 762 | iounmap(rtc->regbase); | 762 | iounmap(rtc->regbase); |
| 763 | err_badmap: | 763 | err_badmap: |
| 764 | release_resource(rtc->res); | 764 | release_mem_region(rtc->res->start, rtc->regsize); |
| 765 | err_badres: | 765 | err_badres: |
| 766 | kfree(rtc); | 766 | kfree(rtc); |
| 767 | 767 | ||
| @@ -786,7 +786,7 @@ static int __exit sh_rtc_remove(struct platform_device *pdev) | |||
| 786 | } | 786 | } |
| 787 | 787 | ||
| 788 | iounmap(rtc->regbase); | 788 | iounmap(rtc->regbase); |
| 789 | release_resource(rtc->res); | 789 | release_mem_region(rtc->res->start, rtc->regsize); |
| 790 | 790 | ||
| 791 | clk_disable(rtc->clk); | 791 | clk_disable(rtc->clk); |
| 792 | clk_put(rtc->clk); | 792 | clk_put(rtc->clk); |