projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
b098d67
)
Merge remote-tracking branch 'spi/fix/core' into spi-linus
author
Mark Brown
<broonie@linaro.org>
Sun, 30 Mar 2014 00:50:53 +0000
(
00:50
+0000)
committer
Mark Brown
<broonie@linaro.org>
Sun, 30 Mar 2014 00:50:53 +0000
(
00:50
+0000)
drivers/spi/spi.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/spi/spi.c
b/drivers/spi/spi.c
index d0b28bba38be6bfff2a420e9fc2850e5c84c690b..970866d23a9b709e38d7f5913722c4de2e469fe4 100644
(file)
--- 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);
}
}