Merge remote-tracking branch 'spi/fix/core' into spi-linus (ff13a9a6) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/spi/spi.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}