diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 02:26:33 -0400 |
| commit | c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (patch) | |
| tree | 4ea36009719bd8fc523239fe1bdccb90f0dce3ae /drivers/spi/spi-gpio.c | |
| parent | 14d33d384693eb6083396199de516fdef320f7af (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4'
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
Diffstat (limited to 'drivers/spi/spi-gpio.c')
| -rw-r--r-- | drivers/spi/spi-gpio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 0094c645ff0d..0b56cfc71fab 100644 --- 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) | |||
| 235 | status = gpio_request(cs, dev_name(&spi->dev)); | 235 | status = gpio_request(cs, dev_name(&spi->dev)); |
| 236 | if (status) | 236 | if (status) |
| 237 | return status; | 237 | return status; |
| 238 | status = gpio_direction_output(cs, spi->mode & SPI_CS_HIGH); | 238 | status = gpio_direction_output(cs, |
| 239 | !(spi->mode & SPI_CS_HIGH)); | ||
| 239 | } | 240 | } |
| 240 | } | 241 | } |
| 241 | if (!status) | 242 | if (!status) |