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

git-mirror · Mar 30, 2014 · ff13a9a · ff13a9a
2 parents b098d67 + 0b73aa6
commit ff13a9a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
@@ -591,7 +591,6 @@ static int spi_transfer_one_message(struct spi_master *master,
 				    struct spi_message *msg)
 {
 	struct spi_transfer *xfer;
-	bool cur_cs = true;
 	bool keep_cs = false;
 	int ret = 0;
 
@@ -627,8 +626,9 @@ static int spi_transfer_one_message(struct spi_master *master,
 					 &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);
 			}
 		}