Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / pcmcia / at91_cf.c

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index fb33fa42d249847d1c900a5c374b6859f3cd8dde..4902206f53d942ec6174243991c842ea580feb34 100644 (file)
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -283,8 +283,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
        }
 
        /* reserve chip-select regions */
-       if (!request_mem_region(io->start, io->end + 1 - io->start,
-                               driver_name)) {
+       if (!request_mem_region(io->start, resource_size(io), driver_name)) {
                status = -ENXIO;
                goto fail1;
        }
@@ -308,7 +307,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
        return 0;
 
 fail2:
-       release_mem_region(io->start, io->end + 1 - io->start);
+       release_mem_region(io->start, resource_size(io));
 fail1:
        if (cf->socket.io_offset)
                iounmap((void __iomem *) cf->socket.io_offset);
@@ -339,7 +338,7 @@ static int __exit at91_cf_remove(struct platform_device *pdev)
        struct resource         *io = cf->socket.io[0].res;
 
        pcmcia_unregister_socket(&cf->socket);
-       release_mem_region(io->start, io->end + 1 - io->start);
+       release_mem_region(io->start, resource_size(io));
        iounmap((void __iomem *) cf->socket.io_offset);
        if (board->irq_pin) {
                free_irq(board->irq_pin, cf);