Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/spi/spi_sh_sci.c b/drivers/spi/spi_sh_sci.c
index 7d36720eb982..a65c12ffa733 100644
--- a/drivers/spi/spi_sh_sci.c
+++ b/drivers/spi/spi_sh_sci.c
@@ -148,7 +148,7 @@ static int sh_sci_spi_probe(struct platform_device *dev)
                 ret = -ENOENT;
                 goto err1;
         }
-        sp->membase = ioremap(r->start, r->end - r->start + 1);
+        sp->membase = ioremap(r->start, resource_size(r));
         if (!sp->membase) {
                 ret = -ENXIO;
                 goto err1;