From 691766d7fdbb2c79602aaa54b9fb5f7e7269bdd9 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 6 May 2011 11:43:33 +0200
Subject: [PATCH] --- yaml --- r: 248575 b: refs/heads/master c:
 3d1c89b49119820a60c03e718108c553ce9e6b22 h: refs/heads/master i:   248573:
 0aa18858766c667a5481f48bd0fe47cf00d1a456   248571:
 4e8175db9704d5c2b71401841fb4354a5c425d4f   248567:
 2df96f458acd34ae62694ac28b3407e791cc0fca   248559:
 b694692acad51a94ff493b7ae66a9e90eed15e33   248543:
 4901e8ab7156a074a63c40bd55841e7d32ab47c9   248511:
 8d94411ab362e6346d5a2f2ce40329d9aff38b27   248447:
 e7560702b0fb71fea980505cf003d4581b69b09a   248319:
 2c77a0526e4c9ed655e22d01b76710549fbb0bbc v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-u300/gpio.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e21d532d3b99..a8f2895f2047 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f562988350361bf4118dd3c3e192dff763b493d9
+refs/heads/master: 3d1c89b49119820a60c03e718108c553ce9e6b22
diff --git a/trunk/arch/arm/mach-u300/gpio.c b/trunk/arch/arm/mach-u300/gpio.c
index 94837a4e146b..d92790140fe5 100644
--- a/trunk/arch/arm/mach-u300/gpio.c
+++ b/trunk/arch/arm/mach-u300/gpio.c
@@ -581,7 +581,8 @@ static int __init gpio_probe(struct platform_device *pdev)
 	if (!memres)
 		goto err_no_resource;
 
-	if (!request_mem_region(memres->start, resource_size(memres), "GPIO Controller")) {
+	if (request_mem_region(memres->start, memres->end - memres->start, "GPIO Controller")
+	    == NULL) {
 		err = -ENODEV;
 		goto err_no_ioregion;
 	}
@@ -639,7 +640,7 @@ static int __init gpio_probe(struct platform_device *pdev)
 		free_irq(gpio_ports[i].irq, &gpio_ports[i]);
 	iounmap(virtbase);
  err_no_ioremap:
-	release_mem_region(memres->start, resource_size(memres));
+	release_mem_region(memres->start, memres->end - memres->start);
  err_no_ioregion:
  err_no_resource:
 	clk_disable(clk);
@@ -659,7 +660,7 @@ static int __exit gpio_remove(struct platform_device *pdev)
 	for (i = 0 ; i < U300_GPIO_NUM_PORTS; i++)
 		free_irq(gpio_ports[i].irq, &gpio_ports[i]);
 	iounmap(virtbase);
-	release_mem_region(memres->start, resource_size(memres));
+	release_mem_region(memres->start, memres->end - memres->start);
 	clk_disable(clk);
 	clk_put(clk);
 	return 0;