diff options
| author | Tom Rini <trini@ti.com> | 2013-06-13 15:18:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-13 15:18:35 -0400 |
| commit | f0df254663d44f7fd4b714542bb4602626837465 (patch) | |
| tree | 2b59e4c4caf22cbfe8d59e81306d97f71179b496 /drivers/spi/armada100_spi.c | |
| parent | 41341221d12341a2ecfb280142d6478071738fc2 (diff) | |
| parent | ea7fcc5aeb10d2cbb5589e91f36b205dcaf4b7a8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/armada100_spi.c')
| -rw-r--r-- | drivers/spi/armada100_spi.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/spi/armada100_spi.c b/drivers/spi/armada100_spi.c index afdbe0508c..b237c7c0fe 100644 --- 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); |