Skip to content

Commit

Permalink
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculat…
Browse files Browse the repository at this point in the history
…ions"

This reverts commit b0c3af5.

The driver has been rewritten in ARM tree.
  • Loading branch information
Jiri Kosina committed May 6, 2011
1 parent f562988 commit 3d1c89b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions arch/arm/mach-u300/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand All @@ -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;
Expand Down

0 comments on commit 3d1c89b

Please sign in to comment.