mfd: Use resource_size() in sm501
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 5 Jan 2010 18:55:54 +0000 (19:55 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 7 Mar 2010 21:16:52 +0000 (22:16 +0100)
The requested memory region is smaller than the actual ioremap().
Use resource_size() to get the correct size.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/sm501.c

index 0cc5eef..dc9ea95 100644 (file)
@@ -1430,7 +1430,7 @@ static int __devinit sm501_plat_probe(struct platform_device *dev)
        }
 
        sm->regs_claim = request_mem_region(sm->io_res->start,
-                                           0x100, "sm501");
+                                           resource_size(sm->io_res), "sm501");
 
        if (sm->regs_claim == NULL) {
                dev_err(&dev->dev, "cannot claim registers\n");
@@ -1440,8 +1440,7 @@ static int __devinit sm501_plat_probe(struct platform_device *dev)
 
        platform_set_drvdata(dev, sm);
 
-       sm->regs = ioremap(sm->io_res->start,
-                          (sm->io_res->end - sm->io_res->start) - 1);
+       sm->regs = ioremap(sm->io_res->start, resource_size(sm->io_res));
 
        if (sm->regs == NULL) {
                dev_err(&dev->dev, "cannot remap registers\n");
@@ -1645,7 +1644,7 @@ static int __devinit sm501_pci_probe(struct pci_dev *dev,
        sm->mem_res = &dev->resource[0];
 
        sm->regs_claim = request_mem_region(sm->io_res->start,
-                                           0x100, "sm501");
+                                           resource_size(sm->io_res), "sm501");
        if (sm->regs_claim == NULL) {
                dev_err(&dev->dev, "cannot claim registers\n");
                err= -EBUSY;