1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index 122292557bf3..bdad0bbd0a43 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -540,15 +540,13 @@ static void giveback(struct driver_data *drv_data)
 
         msg->state = NULL;
 
-        /* disable chip select signal. And not stop spi in autobuffer mode */
-        if (drv_data->tx_dma != 0xFFFF) {
-                cs_deactive(drv_data, chip);
-                bfin_spi_disable(drv_data);
-        }
-
         if (!drv_data->cs_change)
                 cs_deactive(drv_data, chip);
 
+        /* Not stop spi in autobuffer mode */
+        if (drv_data->tx_dma != 0xFFFF)
+                bfin_spi_disable(drv_data);
+
         if (msg->complete)
                 msg->complete(msg->context);
 }
@@ -757,7 +755,8 @@ static void pump_transfers(unsigned long data)
 
         write_STAT(drv_data, BIT_STAT_CLR);
         cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
-        cs_active(drv_data, chip);
+        if (drv_data->cs_change)
+                cs_active(drv_data, chip);
 
         dev_dbg(&drv_data->pdev->dev,
                 "now pumping a transfer: width is %d, len is %d\n",
@@ -919,11 +918,11 @@ static void pump_transfers(unsigned long data)
                 } else {
                         /* Update total byte transfered */
                         message->actual_length += drv_data->len_in_bytes;
-
                         /* Move to next transfer of this msg */
                         message->state = next_transfer(drv_data);
+                        if (drv_data->cs_change)
+                                cs_deactive(drv_data, chip);
                 }
-
                 /* Schedule next transfer tasklet */
                 tasklet_schedule(&drv_data->pump_transfers);