Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 645ca8d54ec4..1ebc801678b0 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -32,6 +32,7 @@
 #include <linux/memory.h>
 #include <linux/ioport.h>
 #include <linux/raid/pq.h>
+#include <linux/slab.h>
 
 #include <mach/adma.h>
 
@@ -1470,7 +1471,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
                 return -ENODEV;
 
         if (!devm_request_mem_region(&pdev->dev, res->start,
-                                res->end - res->start, pdev->name))
+                                resource_size(res), pdev->name))
                 return -EBUSY;
 
         adev = kzalloc(sizeof(*adev), GFP_KERNEL);
@@ -1542,7 +1543,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
         iop_chan->device = adev;
 
         iop_chan->mmr_base = devm_ioremap(&pdev->dev, res->start,
-                                        res->end - res->start);
+                                        resource_size(res));
         if (!iop_chan->mmr_base) {
                 ret = -ENOMEM;
                 goto err_free_iop_chan;