Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[pandora-kernel.git] / drivers / of / address.c

diff --git a/drivers/of/address.c b/drivers/of/address.c
index da1f4b9..72c33fb 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -610,6 +610,6 @@ void __iomem *of_iomap(struct device_node *np, int index)
        if (of_address_to_resource(np, index, &res))
                return NULL;
 
-       return ioremap(res.start, 1 + res.end - res.start);
+       return ioremap(res.start, resource_size(&res));
 }
 EXPORT_SYMBOL(of_iomap);