From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Dec 2009 23:59:05 +0000 (-0800)
Subject: Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf931a01a2c024a54204b4b02276af6e8d99a2c0;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6:
  spi: spi_txx9.c: use resource_size()
  spi: spi_sh_sci.c: use resource_size()
  spi: spi_mpc8xxx.c: use resource_size()
  spi: spi_bfin5xx.c: use resource_size()
  spi: atmel_spi.c: use resource_size()
  spi: Add s3c64xx SPI Controller driver
  atmel_spi: fix dma addr calculation for len > BUFFER_SIZE
  spi_s3c24xx: add FIQ pseudo-DMA support
  spi: controller driver for Designware SPI core
  spidev: add proper section markers
  spidev: use DECLARE_BITMAP instead of declaring the array
---

bf931a01a2c024a54204b4b02276af6e8d99a2c0
diff --cc drivers/spi/spi_mpc8xxx.c
index e9390d747bfc,797226cb7ef1..1fb2a6ea328c
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@@ -1013,10 -566,10 +1013,10 @@@ mpc8xxx_spi_probe(struct device *dev, s
  
  	init_completion(&mpc8xxx_spi->done);
  
- 	mpc8xxx_spi->base = ioremap(mem->start, mem->end - mem->start + 1);
+ 	mpc8xxx_spi->base = ioremap(mem->start, resource_size(mem));
  	if (mpc8xxx_spi->base == NULL) {
  		ret = -ENOMEM;
 -		goto put_master;
 +		goto err_ioremap;
  	}
  
  	mpc8xxx_spi->irq = irq;