lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"

Browse Source 
This reverts commit b0c3af5ef0.

The driver has been rewritten in ARM tree.
This commit is contained in:
Jiri Kosina
2011-05-06 11:43:33 +02:00
parent f562988350
commit 3d1c89b491
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-u300/gpio.c
View File

@@ -581,7 +581,8 @@ static int __init gpio_probe(struct platform_device *pdev)
if (!memres) if (!memres)
goto err_no_resource; 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; err = -ENODEV;
goto err_no_ioregion; 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]); free_irq(gpio_ports[i].irq, &gpio_ports[i]);
iounmap(virtbase); iounmap(virtbase);
err_no_ioremap: 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_ioregion:
err_no_resource: err_no_resource:
clk_disable(clk); 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++) for (i = 0 ; i < U300_GPIO_NUM_PORTS; i++)
free_irq(gpio_ports[i].irq, &gpio_ports[i]); free_irq(gpio_ports[i].irq, &gpio_ports[i]);
iounmap(virtbase); iounmap(virtbase);
release_mem_region(memres->start, resource_size(memres)); release_mem_region(memres->start, memres->end - memres->start);
clk_disable(clk); clk_disable(clk);
clk_put(clk); clk_put(clk);
return 0; return 0;