Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / drivers / spi / spi-mxs.c

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index b735988641e030b40333205d1c832fbbd31490d7..22a0af0147fb52be3fcb4111efaaafce27b80663 100644 (file)
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -241,6 +241,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
        INIT_COMPLETION(spi->c);
 
        ctrl0 = readl(ssp->base + HW_SSP_CTRL0);
+       ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT;
        ctrl0 |= BM_SSP_CTRL0_DATA_XFER | mxs_spi_cs_to_reg(cs);
 
        if (*first)
@@ -256,8 +257,10 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
                if ((sg_count + 1 == sgs) && *last)
                        ctrl0 |= BM_SSP_CTRL0_IGNORE_CRC;
 
-               if (ssp->devid == IMX23_SSP)
+               if (ssp->devid == IMX23_SSP) {
+                       ctrl0 &= ~BM_SSP_CTRL0_XFER_COUNT;
                        ctrl0 |= min;
+               }
 
                dma_xfer[sg_count].pio[0] = ctrl0;
                dma_xfer[sg_count].pio[3] = min;