Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...

[~andy/linux] / drivers / net / mv643xx_eth.c

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 77dc6abe186765789cd77db04def9155a15ebfba..259699983ca51c272a3ee42bfd4d922c85238440 100644 (file)
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2597,7 +2597,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
        if (msp == NULL)
                goto out;
 
-       msp->base = ioremap(res->start, res->end - res->start + 1);
+       msp->base = ioremap(res->start, resource_size(res));
        if (msp->base == NULL)
                goto out_free;