Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0c3af5e authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

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



Convert off-by-1 r->end - r->start to resource_size(r)

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 99172a2f

arch/arm/mach-u300/gpio.c

+3 −4
Original line number Diff line number Diff line
@@ -581,8 +581,7 @@ static int __init gpio_probe(struct platform_device *pdev) 
	if (!memres)

		goto err_no_resource;



	if (request_mem_region(memres->start, memres->end - memres->start, "GPIO Controller")

	    == NULL) {

	if (!request_mem_region(memres->start, resource_size(memres), "GPIO Controller")) {

		err = -ENODEV;

		goto err_no_ioregion;

	}
@@ -640,7 +639,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, memres->end - memres->start);

	release_mem_region(memres->start, resource_size(memres));

 err_no_ioregion:

 err_no_resource:

	clk_disable(clk);
@@ -660,7 +659,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, memres->end - memres->start);

	release_mem_region(memres->start, resource_size(memres));

	clk_disable(clk);

	clk_put(clk);

	return 0;