Merge branch 'dell-wmi' into release

[~andy/linux] / drivers / ide / au1xxx-ide.c

diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 58121bd6c1152c62199cc3417713a8c7416c80d6..87cef0c440ad32f625fe7bd55e368b8a427afcf4 100644 (file)
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -532,14 +532,13 @@ static int au_ide_probe(struct platform_device *dev)
                goto out;
        }
 
-       if (!request_mem_region(res->start, res->end - res->start + 1,
-                               dev->name)) {
+       if (!request_mem_region(res->start, resource_size(res), dev->name)) {
                pr_debug("%s: request_mem_region failed\n", DRV_NAME);
                ret =  -EBUSY;
                goto out;
        }
 
-       ahwif->regbase = (u32)ioremap(res->start, res->end - res->start + 1);
+       ahwif->regbase = (u32)ioremap(res->start, resource_size(res));
        if (ahwif->regbase == 0) {
                ret = -ENOMEM;
                goto out;
@@ -575,7 +574,7 @@ static int au_ide_remove(struct platform_device *dev)
        iounmap((void *)ahwif->regbase);
 
        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
-       release_mem_region(res->start, res->end - res->start + 1);
+       release_mem_region(res->start, resource_size(res));
 
        return 0;
 }