Merge branch 'next' into for-linus-3.0

[pandora-kernel.git] / drivers / dma / mv_xor.c

diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 954e334..9a353c2 100644 (file)
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -1305,7 +1305,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
                return -ENODEV;
 
        msp->xor_base = devm_ioremap(&pdev->dev, res->start,
-                                    res->end - res->start + 1);
+                                    resource_size(res));
        if (!msp->xor_base)
                return -EBUSY;
 
@@ -1314,7 +1314,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev)
                return -ENODEV;
 
        msp->xor_high_base = devm_ioremap(&pdev->dev, res->start,
-                                         res->end - res->start + 1);
+                                         resource_size(res));
        if (!msp->xor_high_base)
                return -EBUSY;