From 2068f875dc7db3bd3ab129ebf796e9bfd6d12ccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
Date: Thu, 9 Feb 2012 22:21:45 +0100
Subject: [PATCH] --- yaml --- r: 318253 b: refs/heads/master c:
 05644147064acabb8587c4cbd690047494f7b3a1 h: refs/heads/master i:   318251:
 d8068d94cf89d30cbb9895365c313d32930a722a v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/spi/spi-gpio.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4659d5357e2..5cbee8b2db6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 619ac8d3e582ccd806f24dcfc369c4c250ca9814
+refs/heads/master: 05644147064acabb8587c4cbd690047494f7b3a1
diff --git a/trunk/drivers/spi/spi-gpio.c b/trunk/drivers/spi/spi-gpio.c
index 0094c645ff0d..0b56cfc71fab 100644
--- a/trunk/drivers/spi/spi-gpio.c
+++ b/trunk/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)