Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / drivers / spi / spi-gpio.c

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 9ddef55a716549422f00b11b1eca8603428873cf..0021fc4c45bc2f4c9bb0e676bc6cab2fc3b5f02d 100644 (file)
--- 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) {