From 4e6c9cf39eceba5e0252e1294ac1aaa3c9757cc8 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 22 Apr 2011 20:11:21 +0000
Subject: [PATCH] --- yaml --- r: 251103 b: refs/heads/master c:
 683e7cdc207f71eef3ff46f5d36ec505c65fbbc6 h: refs/heads/master i:   251101:
 299c36bbb830769cff762c46923f7509aa957c77   251099:
 30f1849d4f00570a37d49827d8f6a474c8d43100   251095:
 72f229ced1102001b97573a8621032566f7f3292   251087:
 676d36615282a112737df7bb5cbfec121b789fec   251071:
 670aed285e70c03555462dfb84f69212fae13b15 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/video/s3c-fb.c   | 6 ++----
 trunk/drivers/video/sh7760fb.c | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 11c7450a91e4..b0f03bb417ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94cd1ae2fd251fd8206c043ce91a99a45439a116
+refs/heads/master: 683e7cdc207f71eef3ff46f5d36ec505c65fbbc6
diff --git a/trunk/drivers/video/s3c-fb.c b/trunk/drivers/video/s3c-fb.c
index 3fa7911ac906..d570e588f40a 100644
--- a/trunk/drivers/video/s3c-fb.c
+++ b/trunk/drivers/video/s3c-fb.c
@@ -1449,8 +1449,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
 	iounmap(sfb->regs);
 
 err_req_region:
-	release_resource(sfb->regs_res);
-	kfree(sfb->regs_res);
+	release_mem_region(sfb->regs_res->start, resource_size(sfb->regs_res));
 
 err_clk:
 	clk_disable(sfb->bus_clk);
@@ -1486,8 +1485,7 @@ static int __devexit s3c_fb_remove(struct platform_device *pdev)
 	clk_disable(sfb->bus_clk);
 	clk_put(sfb->bus_clk);
 
-	release_resource(sfb->regs_res);
-	kfree(sfb->regs_res);
+	release_mem_region(sfb->regs_res->start, resource_size(sfb->regs_res));
 
 	kfree(sfb);
 
diff --git a/trunk/drivers/video/sh7760fb.c b/trunk/drivers/video/sh7760fb.c
index 8fe19582c460..45e47d847163 100644
--- a/trunk/drivers/video/sh7760fb.c
+++ b/trunk/drivers/video/sh7760fb.c
@@ -551,8 +551,7 @@ static int __devinit sh7760fb_probe(struct platform_device *pdev)
 		free_irq(par->irq, &par->vsync);
 	iounmap(par->base);
 out_res:
-	release_resource(par->ioarea);
-	kfree(par->ioarea);
+	release_mem_region(res->start, resource_size(res));
 out_fb:
 	framebuffer_release(info);
 	return ret;
@@ -570,8 +569,7 @@ static int __devexit sh7760fb_remove(struct platform_device *dev)
 	if (par->irq >= 0)
 		free_irq(par->irq, par);
 	iounmap(par->base);
-	release_resource(par->ioarea);
-	kfree(par->ioarea);
+	release_mem_region(par->ioarea->start, resource_size(par->ioarea));
 	framebuffer_release(info);
 	platform_set_drvdata(dev, NULL);