Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / spi / spi-gpio.c

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 0094c64..0b56cfc 100644 (file)
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -235,7 +235,8 @@ static int spi_gpio_setup(struct spi_device *spi)
                        status = gpio_request(cs, dev_name(&spi->dev));
                        if (status)
                                return status;
-                       status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH);
+                       status = gpio_direction_output(cs,
+                                       !(spi->mode & SPI_CS_HIGH));
                }
        }
        if (!status)