aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-04-22 16:11:23 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 03:09:03 -0400
commit08f3153861e3ce8ff28fa82efe50cfb744afee7e (patch)
treee4d7f5aa19b3ec876b26f2eb7dcaf9938455b4ef
parentd2f6b7f7aaa245d6d96f9b3a95fc258f20c9e0a8 (diff)
drivers/video/s3c2410fb.c: Convert release_resource to release_mem_region
Request_mem_region should be used with release_mem_region, not release_resource. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @s exists@ expression e1,e2,e3,e4,e; @@ *e4 = request_mem_region(e1,e2,e3) ... when != e4 = e *release_resource(e4); // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/s3c2410fb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 61c819e35f7f..0aa13761de6e 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -867,7 +867,7 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev,
867 goto dealloc_fb; 867 goto dealloc_fb;
868 } 868 }
869 869
870 size = (res->end - res->start) + 1; 870 size = resource_size(res);
871 info->mem = request_mem_region(res->start, size, pdev->name); 871 info->mem = request_mem_region(res->start, size, pdev->name);
872 if (info->mem == NULL) { 872 if (info->mem == NULL) {
873 dev_err(&pdev->dev, "failed to get memory region\n"); 873 dev_err(&pdev->dev, "failed to get memory region\n");
@@ -997,8 +997,7 @@ release_irq:
997release_regs: 997release_regs:
998 iounmap(info->io); 998 iounmap(info->io);
999release_mem: 999release_mem:
1000 release_resource(info->mem); 1000 release_mem_region(res->start, size);
1001 kfree(info->mem);
1002dealloc_fb: 1001dealloc_fb:
1003 platform_set_drvdata(pdev, NULL); 1002 platform_set_drvdata(pdev, NULL);
1004 framebuffer_release(fbinfo); 1003 framebuffer_release(fbinfo);
@@ -1044,8 +1043,7 @@ static int __devexit s3c2410fb_remove(struct platform_device *pdev)
1044 1043
1045 iounmap(info->io); 1044 iounmap(info->io);
1046 1045
1047 release_resource(info->mem); 1046 release_mem_region(info->mem->start, resource_size(info->mem));
1048 kfree(info->mem);
1049 1047
1050 platform_set_drvdata(pdev, NULL); 1048 platform_set_drvdata(pdev, NULL);
1051 framebuffer_release(fbinfo); 1049 framebuffer_release(fbinfo);