diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-03-30 00:50:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-30 00:50:53 +0000 |
| commit | ff13a9a6a74a73f800a3478518636945713da9f6 (patch) | |
| tree | bf0e1e0f9915f0990729a82f4b605e18835b3959 /drivers/spi/spi.c | |
| parent | Linux 3.14-rc8 (diff) | |
| parent | spi: Fix handling of cs_change in core implementation (diff) | |
| download | linux-dev-ff13a9a6a74a73f800a3478518636945713da9f6.tar.xz linux-dev-ff13a9a6a74a73f800a3478518636945713da9f6.zip | |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index d0b28bba38be..970866d23a9b 100644 --- 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); } } |