Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-fsl-dspi.c

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 86bcdd68c1fe09f1640fc352cc2d94f0aa53566d..59a11437db7090f9c8464f8ca0584c789be2e997 100644 (file)
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -409,9 +409,6 @@ static int dspi_transfer_one_message(struct spi_master *master,
                                SPI_MCR_CLR_TXF | SPI_MCR_CLR_RXF);
                regmap_write(dspi->regmap, SPI_CTAR(dspi->cs),
                                dspi->cur_chip->ctar_val);
-               if (transfer->speed_hz)
-                       regmap_write(dspi->regmap, SPI_CTAR(dspi->cs),
-                                       dspi->cur_chip->ctar_val);
 
                trans_mode = dspi->devtype_data->trans_mode;
                switch (trans_mode) {