From: Josef Ahmad Date: Tue, 9 Apr 2013 17:25:34 +0000 (+0100) Subject: spi-gpio: init CS before spi_bitbang_setup() X-Git-Tag: firefly_0821_release~3680^2~667^2~18 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b8cc3306e78490bda26815b04c786d8e1fc1489;p=firefly-linux-kernel-4.4.55.git spi-gpio: init CS before spi_bitbang_setup() spi_bitbang_setup() deasserts the chip select line to initialise the device. The chip select GPIO line is obtained from spi_gpio->cs_gpios[] private data. Currently, devices that are not registered under devicetree environment will call into spi_bitbang_setup() with stale cs_gpios[]. This patch ensures spi_gpio->cs_gpios[] is always initialised prior to calling spi_bitbang_setup(). Reviewed-by: Daniel Mack Signed-off-by: Josef Ahmad Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 9ddef55a7165..0021fc4c45bc 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@ -265,9 +265,9 @@ static int spi_gpio_setup(struct spi_device *spi) } } if (!status) { - status = spi_bitbang_setup(spi); /* in case it was initialized from static board data */ spi_gpio->cs_gpios[spi->chip_select] = cs; + status = spi_bitbang_setup(spi); } if (status) {