projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
spi
/
atmel_spi.c
diff --git
a/drivers/spi/atmel_spi.c
b/drivers/spi/atmel_spi.c
index
6fa260d
..
66e7bc9
100644
(file)
--- a/
drivers/spi/atmel_spi.c
+++ b/
drivers/spi/atmel_spi.c
@@
-425,7
+425,7
@@
static int atmel_spi_setup(struct spi_device *spi)
if (ret)
return ret;
spi->controller_state = (void *)npcs_pin;
- gpio_direction_output(npcs_pin);
+ gpio_direction_output(npcs_pin
, !(spi->mode & SPI_CS_HIGH)
);
}
dev_dbg(&spi->dev,