From bf32a9c78871f37a10dc259706195599f651851a Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 14 Dec 2009 16:30:46 -0500
Subject: [PATCH] --- yaml --- r: 195839 b: refs/heads/master c:
 db5a5ae25aae66354712674b1643759897ff0325 h: refs/heads/master i:   195837:
 683bc551474fb40f39ce7a17e2ec7b5f4fdc91b2   195835:
 eb400ccfa396ae369ac4eb1e7eb474c1350328ed   195831:
 19c51072868f6f67b54e58cd8325b0ef32e10489   195823:
 50c07bb2e56fc12818247945069b5ef21ac72e6e   195807:
 04337f34e79b910c7127402f20ccb32d23c441d1   195775:
 51220f07a851dc580954cb54c3954b2754117c75   195711:
 ddded08b9eca133283af45ed4d9ebaaa9d8152cb   195583:
 32a9275aecb805bfff0828f9716b3bbbbb393aad v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mtd/nand/gpio.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6e9accb802c1..60c6ab182e7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58e6a84dfbd6f125b69e8b105c2cdbf22f97d5de
+refs/heads/master: db5a5ae25aae66354712674b1643759897ff0325
diff --git a/trunk/drivers/mtd/nand/gpio.c b/trunk/drivers/mtd/nand/gpio.c
index 8f902e75aa85..0cde618bcc1e 100644
--- a/trunk/drivers/mtd/nand/gpio.c
+++ b/trunk/drivers/mtd/nand/gpio.c
@@ -181,11 +181,11 @@ static int __devexit gpio_nand_remove(struct platform_device *dev)
 	res = platform_get_resource(dev, IORESOURCE_MEM, 1);
 	iounmap(gpiomtd->io_sync);
 	if (res)
-		release_mem_region(res->start, res->end - res->start + 1);
+		release_mem_region(res->start, resource_size(res));
 
 	res = platform_get_resource(dev, IORESOURCE_MEM, 0);
 	iounmap(gpiomtd->nand_chip.IO_ADDR_R);
-	release_mem_region(res->start, res->end - res->start + 1);
+	release_mem_region(res->start, resource_size(res));
 
 	if (gpio_is_valid(gpiomtd->plat.gpio_nwp))
 		gpio_set_value(gpiomtd->plat.gpio_nwp, 0);
@@ -208,14 +208,14 @@ static void __iomem *request_and_remap(struct resource *res, size_t size,
 {
 	void __iomem *ptr;
 
-	if (!request_mem_region(res->start, res->end - res->start + 1, name)) {
+	if (!request_mem_region(res->start, resource_size(res), name)) {
 		*err = -EBUSY;
 		return NULL;
 	}
 
 	ptr = ioremap(res->start, size);
 	if (!ptr) {
-		release_mem_region(res->start, res->end - res->start + 1);
+		release_mem_region(res->start, resource_size(res));
 		*err = -ENOMEM;
 	}
 	return ptr;
@@ -338,10 +338,10 @@ static int __devinit gpio_nand_probe(struct platform_device *dev)
 err_nce:
 	iounmap(gpiomtd->io_sync);
 	if (res1)
-		release_mem_region(res1->start, res1->end - res1->start + 1);
+		release_mem_region(res1->start, resource_size(res1));
 err_sync:
 	iounmap(gpiomtd->nand_chip.IO_ADDR_R);
-	release_mem_region(res0->start, res0->end - res0->start + 1);
+	release_mem_region(res0->start, resource_size(res0));
 err_map:
 	kfree(gpiomtd);
 	return ret;