Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / i2c / busses / i2c-at91.c

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 67d9dc5b351b57e96d41f97f1d53da5f9c7fc9a1..06e1ecb4919f6258c157358183604accb109482c 100644 (file)
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -200,10 +200,10 @@ static int __devinit at91_i2c_probe(struct platform_device *pdev)
        if (!res)
                return -ENXIO;
 
-       if (!request_mem_region(res->start, res->end - res->start + 1, "at91_i2c"))
+       if (!request_mem_region(res->start, resource_size(res), "at91_i2c"))
                return -EBUSY;
 
-       twi_base = ioremap(res->start, res->end - res->start + 1);
+       twi_base = ioremap(res->start, resource_size(res));
        if (!twi_base) {
                rc = -ENOMEM;
                goto fail0;
@@ -252,7 +252,7 @@ fail2:
 fail1:
        iounmap(twi_base);
 fail0:
-       release_mem_region(res->start, res->end - res->start + 1);
+       release_mem_region(res->start, resource_size(res));
 
        return rc;
 }
@@ -268,7 +268,7 @@ static int __devexit at91_i2c_remove(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        iounmap(twi_base);
-       release_mem_region(res->start, res->end - res->start + 1);
+       release_mem_region(res->start, resource_size(res));
 
        clk_disable(twi_clk);           /* disable peripheral clock */
        clk_put(twi_clk);