evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2014-03-30 00:50:53 +00:00
commit ff13a9a6a7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/spi/spi.c
View file

@ -591,7 +591,6 @@ static int spi_transfer_one_message(struct spi_master *master,
struct spi_message *msg) struct spi_message *msg)
{ {
struct spi_transfer *xfer; struct spi_transfer *xfer;
bool cur_cs = true;
bool keep_cs = false; bool keep_cs = false;
int ret = 0; int ret = 0;
@ -627,8 +626,9 @@ static int spi_transfer_one_message(struct spi_master *master,
&msg->transfers)) { &msg->transfers)) {
keep_cs = true; keep_cs = true;
} else { } else {
cur_cs = !cur_cs; spi_set_cs(msg->spi, false);
spi_set_cs(msg->spi, cur_cs); udelay(10);
spi_set_cs(msg->spi, true);
} }
} }