Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull SPI bug fixes from Grant Likely:
 "Miscellaneous driver bug fixes.  No major changes in this branch."

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi/imx: prevent NULL pointer dereference in spi_imx_probe()
  spi/imx: mark base member in spi_imx_data as __iomem
  spi/mpc83xx: fix NULL pdata dereference bug
  spi/davinci: Fix DMA API usage in davinci
  spi/pL022: include types.h to remove compilation warnings

3 files changed, 14 insertions, 8 deletions

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 31bfba805cf4..9b2901feaf78 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -653,7 +653,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
                         dev_dbg(sdev, "Couldn't DMA map a %d bytes RX buffer\n",
                                                                 rx_buf_count);
                         if (t->tx_buf)
-                                dma_unmap_single(NULL, t->tx_dma, t->len,
+                                dma_unmap_single(&spi->dev, t->tx_dma, t->len,
                                                                 DMA_TO_DEVICE);
                         return -ENOMEM;
                 }
@@ -692,10 +692,10 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
         if (spicfg->io_type == SPI_IO_TYPE_DMA) {
 
                 if (t->tx_buf)
-                        dma_unmap_single(NULL, t->tx_dma, t->len,
+                        dma_unmap_single(&spi->dev, t->tx_dma, t->len,
                                                                 DMA_TO_DEVICE);
 
-                dma_unmap_single(NULL, t->rx_dma, rx_buf_count,
+                dma_unmap_single(&spi->dev, t->rx_dma, rx_buf_count,
                                                         DMA_FROM_DEVICE);
 
                 clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN);
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 24cacff57786..5f748c0d96bd 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -139,10 +139,12 @@ static void fsl_spi_change_mode(struct spi_device *spi)
 static void fsl_spi_chipselect(struct spi_device *spi, int value)
 {
         struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(spi->master);
-        struct fsl_spi_platform_data *pdata = spi->dev.parent->platform_data;
+        struct fsl_spi_platform_data *pdata;
         bool pol = spi->mode & SPI_CS_HIGH;
         struct spi_mpc8xxx_cs   *cs = spi->controller_state;
 
+        pdata = spi->dev.parent->parent->platform_data;
+
         if (value == BITBANG_CS_INACTIVE) {
                 if (pdata->cs_control)
                         pdata->cs_control(spi, !pol);
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 31054e3de4c1..570f22053be8 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -83,7 +83,7 @@ struct spi_imx_data {
         struct spi_bitbang bitbang;
 
         struct completion xfer_done;
-        void *base;
+        void __iomem *base;
         int irq;
         struct clk *clk;
         unsigned long spi_clk;
@@ -766,8 +766,12 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
         }
 
         ret = of_property_read_u32(np, "fsl,spi-num-chipselects", &num_cs);
-        if (ret < 0)
-                num_cs = mxc_platform_info->num_chipselect;
+        if (ret < 0) {
+                if (mxc_platform_info)
+                        num_cs = mxc_platform_info->num_chipselect;
+                else
+                        return ret;
+        }
 
         master = spi_alloc_master(&pdev->dev,
                         sizeof(struct spi_imx_data) + sizeof(int) * num_cs);
@@ -784,7 +788,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
 
         for (i = 0; i < master->num_chipselect; i++) {
                 int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);
-                if (cs_gpio < 0)
+                if (cs_gpio < 0 && mxc_platform_info)
                         cs_gpio = mxc_platform_info->chipselect[i];
 
                 spi_imx->chipselect[i] = cs_gpio;