From: Mark Brown <broonie@linaro.org>
Date: Sun, 30 Mar 2014 00:51:41 +0000 (+0000)
Subject: Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic... 
X-Git-Tag: firefly_0821_release~176^2~4201^2~1
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b1ad487c42e982bb30f10bfb267f71c5daa3a0d5;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branches 'spi/topic/sunxi', 'spi/topic/tegra114', 'spi/topic/ti-qspi', 'spi/topic/ti-ssp', 'spi/topic/topcliff-pch', 'spi/topic/txx9', 'spi/topic/xcomm' and 'spi/topic/xfer' into spi-next
---

b1ad487c42e982bb30f10bfb267f71c5daa3a0d5
diff --cc drivers/spi/spi.c
index ffc1a2ebc4ca,23756b0f9036,23756b0f9036,23756b0f9036,23756b0f9036,23756b0f9036,23756b0f9036,23756b0f9036,516643d243c6..4eb9bf02996c
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@@@@@@@@ -754,8 -591,9 -591,9 -591,9 -591,9 -591,9 -591,9 -591,9 -591,10 +754,9 @@@@@@@@@@ static int spi_transfer_one_message(str
         				    struct spi_message *msg)
         {
         	struct spi_transfer *xfer;
 --------	bool cur_cs = true;
         	bool keep_cs = false;
         	int ret = 0;
++++++++ 	int ms = 1;
         
         	spi_set_cs(msg->spi, true);