summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-ath79.c
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-03-02 20:54:42 +0100
committerMark Brown <broonie@linaro.org>2014-03-03 12:38:52 +0800
commit61d1cf163c8653934cc8cd5d0b2a562d0990c265 (patch)
treef903b894bd2b2a452bbfdb9cf81f077308d0e7dd /drivers/spi/spi-ath79.c
parent38dbfb59d1175ef458d006556061adeaa8751b72 (diff)
downloadlinux-61d1cf163c8653934cc8cd5d0b2a562d0990c265.tar.gz
linux-61d1cf163c8653934cc8cd5d0b2a562d0990c265.tar.bz2
linux-61d1cf163c8653934cc8cd5d0b2a562d0990c265.zip
spi: spi-ath79: fix initial GPIO CS line setup
The 'ath79_spi_setup_cs' function initializes the chip select line of a given SPI device in order to make sure that the device is inactive. If the SPI_CS_HIGH bit is set for a given device, it means that the CS line of that device is active HIGH so it must be set to LOW initially. In case of GPIO CS lines, the 'ath79_spi_setup_cs' function does the opposite of that due to the wrong GPIO flags. Fix the code to use the correct GPIO flags. Reported-by: Ronald Wahl <ronald.wahl@raritan.com> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Signed-off-by: Mark Brown <broonie@linaro.org> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/spi/spi-ath79.c')
-rw-r--r--drivers/spi/spi-ath79.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-ath79.c b/drivers/spi/spi-ath79.c
index 31534b51715a..c3b2fb9b6713 100644
--- a/drivers/spi/spi-ath79.c
+++ b/drivers/spi/spi-ath79.c
@@ -132,9 +132,9 @@ static int ath79_spi_setup_cs(struct spi_device *spi)
flags = GPIOF_DIR_OUT;
if (spi->mode & SPI_CS_HIGH)
- flags |= GPIOF_INIT_HIGH;
- else
flags |= GPIOF_INIT_LOW;
+ else
+ flags |= GPIOF_INIT_HIGH;
status = gpio_request_one(cdata->gpio, flags,
dev_name(&spi->dev));