---

yaml --- r: 248575 b: refs/heads/master c: 3d1c89b h: refs/heads/master i: 248573: 0aa1885 248571: 4e8175d 248567: 2df96f4 248559: b694692 248543: 4901e8a 248511: 8d94411 248447: e756070 248319: 2c77a05 v: v3
git-mirror · May 6, 2011 · 691766d · 691766d
1 parent 1c2f282
commit 691766d
Show file tree

Hide file tree

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