From 107a08ca05c009c516399798bacd108193569216 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 22 Apr 2011 20:11:23 +0000 Subject: [PATCH] --- yaml --- r: 251105 b: refs/heads/master c: 08f3153861e3ce8ff28fa82efe50cfb744afee7e h: refs/heads/master i: 251103: 4e6c9cf39eceba5e0252e1294ac1aaa3c9757cc8 v: v3 --- [refs] | 2 +- trunk/drivers/video/s3c2410fb.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8d463691f135..1d7d34f4d7d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2f6b7f7aaa245d6d96f9b3a95fc258f20c9e0a8 +refs/heads/master: 08f3153861e3ce8ff28fa82efe50cfb744afee7e diff --git a/trunk/drivers/video/s3c2410fb.c b/trunk/drivers/video/s3c2410fb.c index 61c819e35f7f..0aa13761de6e 100644 --- a/trunk/drivers/video/s3c2410fb.c +++ b/trunk/drivers/video/s3c2410fb.c @@ -867,7 +867,7 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev, goto dealloc_fb; } - size = (res->end - res->start) + 1; + size = resource_size(res); info->mem = request_mem_region(res->start, size, pdev->name); if (info->mem == NULL) { dev_err(&pdev->dev, "failed to get memory region\n"); @@ -997,8 +997,7 @@ static int __devinit s3c24xxfb_probe(struct platform_device *pdev, release_regs: iounmap(info->io); release_mem: - release_resource(info->mem); - kfree(info->mem); + release_mem_region(res->start, size); dealloc_fb: platform_set_drvdata(pdev, NULL); framebuffer_release(fbinfo); @@ -1044,8 +1043,7 @@ static int __devexit s3c2410fb_remove(struct platform_device *pdev) iounmap(info->io); - release_resource(info->mem); - kfree(info->mem); + release_mem_region(info->mem->start, resource_size(info->mem)); platform_set_drvdata(pdev, NULL); framebuffer_release(fbinfo);