summaryrefslogtreecommitdiff
path: root/drivers/edac/cpc925_edac.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2009-09-23 15:57:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 07:21:04 -0700
commit30a61fff3a2b19506c66ea81fecb6a7747af3d47 (patch)
tree541f2337616caa095e517af0d4a0549a174818bd /drivers/edac/cpc925_edac.c
parentb4846251727a38a7f248e41308c060995371dd05 (diff)
downloadkernel-common-30a61fff3a2b19506c66ea81fecb6a7747af3d47.tar.gz
kernel-common-30a61fff3a2b19506c66ea81fecb6a7747af3d47.tar.bz2
kernel-common-30a61fff3a2b19506c66ea81fecb6a7747af3d47.zip
edac: fix resource size calculation
Use the function resource_size, which reduces the chance of introducing off-by-one errors in calculating the resource size. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ struct resource *res; @@ - (res->end - res->start) + 1 + resource_size(res) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Doug Thompson <dougthompson@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/edac/cpc925_edac.c')
-rw-r--r--drivers/edac/cpc925_edac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c
index 8c54196b5aba..3d50274f1348 100644
--- a/drivers/edac/cpc925_edac.c
+++ b/drivers/edac/cpc925_edac.c
@@ -885,14 +885,14 @@ static int __devinit cpc925_probe(struct platform_device *pdev)
if (!devm_request_mem_region(&pdev->dev,
r->start,
- r->end - r->start + 1,
+ resource_size(r),
pdev->name)) {
cpc925_printk(KERN_ERR, "Unable to request mem region\n");
res = -EBUSY;
goto err1;
}
- vbase = devm_ioremap(&pdev->dev, r->start, r->end - r->start + 1);
+ vbase = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!vbase) {
cpc925_printk(KERN_ERR, "Unable to ioremap device\n");
res = -ENOMEM;
@@ -953,7 +953,7 @@ err3:
cpc925_mc_exit(mci);
edac_mc_free(mci);
err2:
- devm_release_mem_region(&pdev->dev, r->start, r->end-r->start+1);
+ devm_release_mem_region(&pdev->dev, r->start, resource_size(r));
err1:
devres_release_group(&pdev->dev, cpc925_probe);
out: