diff options
author | Julia Lawall <julia@diku.dk> | 2011-05-26 19:25:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 20:12:33 -0400 |
commit | c258f9a0aab09366070f3c9283070edead23d4cf (patch) | |
tree | c56ccd5534ab88e8e4cfc6c798a50ec20b5f32ea /drivers/rtc | |
parent | 74d34d4be60928c3504fdad9d67707a6e3244a80 (diff) |
drivers/rtc/rtc-mrst.c: use release_mem_region after request_mem_region
The memory allocated using request_mem_region should be released using
release_mem_region, not release_region.
The semantic patch that fixes part of this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression E1,E2,E3;
@@
request_mem_region(E1,E2,E3)
...
?- release_region(E1,E2)
+ release_mem_region(E1,E2)
// </smpl>
[akpm@linux-foundation.org: use resource_size()]
Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-mrst.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c index b2f096871a97..0cec5650d56a 100644 --- a/drivers/rtc/rtc-mrst.c +++ b/drivers/rtc/rtc-mrst.c | |||
@@ -380,7 +380,7 @@ cleanup1: | |||
380 | cleanup0: | 380 | cleanup0: |
381 | dev_set_drvdata(dev, NULL); | 381 | dev_set_drvdata(dev, NULL); |
382 | mrst_rtc.dev = NULL; | 382 | mrst_rtc.dev = NULL; |
383 | release_region(iomem->start, iomem->end + 1 - iomem->start); | 383 | release_mem_region(iomem->start, resource_size(iomem)); |
384 | dev_err(dev, "rtc-mrst: unable to initialise\n"); | 384 | dev_err(dev, "rtc-mrst: unable to initialise\n"); |
385 | return retval; | 385 | return retval; |
386 | } | 386 | } |
@@ -406,7 +406,7 @@ static void __devexit rtc_mrst_do_remove(struct device *dev) | |||
406 | mrst->rtc = NULL; | 406 | mrst->rtc = NULL; |
407 | 407 | ||
408 | iomem = mrst->iomem; | 408 | iomem = mrst->iomem; |
409 | release_region(iomem->start, iomem->end + 1 - iomem->start); | 409 | release_mem_region(iomem->start, resource_size(iomem)); |
410 | mrst->iomem = NULL; | 410 | mrst->iomem = NULL; |
411 | 411 | ||
412 | mrst->dev = NULL; | 412 | mrst->dev = NULL; |