projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
drivers
/
spi
/
armada100_spi.c
diff --git
a/drivers/spi/armada100_spi.c
b/drivers/spi/armada100_spi.c
index
afdbe05
..
b237c7c
100644
(file)
--- a/
drivers/spi/armada100_spi.c
+++ b/
drivers/spi/armada100_spi.c
@@
-182,15
+182,8
@@
int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
goto done;
}
- if (dout)
- pss->tx = dout;
- else
- pss->tx = NULL;
-
- if (din)
- pss->rx = din;
- else
- pss->rx = NULL;
+ pss->tx = dout;
+ pss->rx = din;
if (flags & SPI_XFER_BEGIN) {
spi_cs_activate(slave);