summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-30 00:50:53 +0000
committerMark Brown <broonie@linaro.org>2014-03-30 00:50:53 +0000
commitff13a9a6a74a73f800a3478518636945713da9f6 (patch)
treebf0e1e0f9915f0990729a82f4b605e18835b3959 /drivers/spi
parentb098d6726bbfb94c06d6e1097466187afddae61f (diff)
parent0b73aa63c193006c3d503d4903dd4792a26e1d50 (diff)
downloadlinux-ff13a9a6a74a73f800a3478518636945713da9f6.tar.bz2
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c6
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);
}
}