Merge remote-tracking branch 'spi/fix/core' into spi-linus

diff --combined drivers/spi/spi.c
index d0b28bb,5d826f0..970866d
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -591,7 -591,6 +591,6 @@@ static int spi_transfer_one_message(str
                                    struct spi_message *msg)
  {
        struct spi_transfer *xfer;
-       bool cur_cs = true;
        bool keep_cs = false;
        int ret = 0;
  
@@@ -627,8 -626,9 +626,9 @@@
                                         &msg->transfers)) {
                                keep_cs = true;
                        } else {
-                               cur_cs = !cur_cs;
-                               spi_set_cs(msg->spi, cur_cs);
+                               spi_set_cs(msg->spi, false);
+                               udelay(10);
+                               spi_set_cs(msg->spi, true);
                        }
                }
  
@@@ -755,7 -755,9 +755,7 @@@ static void spi_pump_messages(struct kt
        ret = master->transfer_one_message(master, master->cur_msg);
        if (ret) {
                dev_err(&master->dev,
 -                      "failed to transfer one message from queue: %d\n", ret);
 -              master->cur_msg->status = ret;
 -              spi_finalize_current_message(master);
 +                      "failed to transfer one message from queue\n");
                return;
        }
  }