From 5f72eead348d4a9af10980415a85bfb329d9737d Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@caiaq.de>
Date: Mon, 22 Jun 2009 21:08:04 +0200
Subject: [PATCH] --- yaml --- r: 166071 b: refs/heads/master c:
 53eff4175f1eb25f97425b1526774fecb81444d4 h: refs/heads/master i:   166069:
 7c7a8f4d82fe199a0a8dcfd1b92ae184c937f0c9   166067:
 bc7371bee51ad678a0c4cf1cdb53292d48bd1c39   166063:
 b86efe15580ac084adf2edac451fa7bd29076ec8 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/pxafb.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 29bc926b7c7d..25a1ad789f43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d294948c2ce4e1c85f452154469752cc9b8e876d
+refs/heads/master: 53eff4175f1eb25f97425b1526774fecb81444d4
diff --git a/trunk/drivers/video/pxafb.c b/trunk/drivers/video/pxafb.c
index 6506117c134b..0a301003d928 100644
--- a/trunk/drivers/video/pxafb.c
+++ b/trunk/drivers/video/pxafb.c
@@ -2091,14 +2091,14 @@ static int __devinit pxafb_probe(struct platform_device *dev)
 		goto failed_fbi;
 	}
 
-	r = request_mem_region(r->start, r->end - r->start + 1, dev->name);
+	r = request_mem_region(r->start, resource_size(r), dev->name);
 	if (r == NULL) {
 		dev_err(&dev->dev, "failed to request I/O memory\n");
 		ret = -EBUSY;
 		goto failed_fbi;
 	}
 
-	fbi->mmio_base = ioremap(r->start, r->end - r->start + 1);
+	fbi->mmio_base = ioremap(r->start, resource_size(r));
 	if (fbi->mmio_base == NULL) {
 		dev_err(&dev->dev, "failed to map I/O memory\n");
 		ret = -EBUSY;
@@ -2197,7 +2197,7 @@ static int __devinit pxafb_probe(struct platform_device *dev)
 failed_free_io:
 	iounmap(fbi->mmio_base);
 failed_free_res:
-	release_mem_region(r->start, r->end - r->start + 1);
+	release_mem_region(r->start, resource_size(r));
 failed_fbi:
 	clk_put(fbi->clk);
 	platform_set_drvdata(dev, NULL);
@@ -2237,7 +2237,7 @@ static int __devexit pxafb_remove(struct platform_device *dev)
 	iounmap(fbi->mmio_base);
 
 	r = platform_get_resource(dev, IORESOURCE_MEM, 0);
-	release_mem_region(r->start, r->end - r->start + 1);
+	release_mem_region(r->start, resource_size(r));
 
 	clk_put(fbi->clk);
 	kfree(fbi);