Skip to content

Commit 3d1c89b

Browse files
author
Jiri Kosina
committed
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
This reverts commit b0c3af5. The driver has been rewritten in ARM tree.
1 parent f562988 commit 3d1c89b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

arch/arm/mach-u300/gpio.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,8 @@ static int __init gpio_probe(struct platform_device *pdev)
581581
if (!memres)
582582
goto err_no_resource;
583583

584-
if (!request_mem_region(memres->start, resource_size(memres), "GPIO Controller")) {
584+
if (request_mem_region(memres->start, memres->end - memres->start, "GPIO Controller")
585+
== NULL) {
585586
err = -ENODEV;
586587
goto err_no_ioregion;
587588
}
@@ -639,7 +640,7 @@ static int __init gpio_probe(struct platform_device *pdev)
639640
free_irq(gpio_ports[i].irq, &gpio_ports[i]);
640641
iounmap(virtbase);
641642
err_no_ioremap:
642-
release_mem_region(memres->start, resource_size(memres));
643+
release_mem_region(memres->start, memres->end - memres->start);
643644
err_no_ioregion:
644645
err_no_resource:
645646
clk_disable(clk);
@@ -659,7 +660,7 @@ static int __exit gpio_remove(struct platform_device *pdev)
659660
for (i = 0 ; i < U300_GPIO_NUM_PORTS; i++)
660661
free_irq(gpio_ports[i].irq, &gpio_ports[i]);
661662
iounmap(virtbase);
662-
release_mem_region(memres->start, resource_size(memres));
663+
release_mem_region(memres->start, memres->end - memres->start);
663664
clk_disable(clk);
664665
clk_put(clk);
665666
return 0;

0 commit comments

Comments
 (0)