---

yaml --- r: 251103 b: refs/heads/master c: 683e7cd h: refs/heads/master i: 251101: 299c36b 251099: 30f1849 251095: 72f229c 251087: 676d366 251071: 670aed2 v: v3
git-mirror · May 24, 2011 · 4e6c9cf · 4e6c9cf
1 parent 0bbf62d
commit 4e6c9cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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);