diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-30 21:51:37 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-30 21:51:37 +0300 |
| commit | 8ada17dde84954e36d8bc6ff62a6956686eb0ec4 (patch) | |
| tree | bdcd62c9e31adfed1aed06c0f41cb4719e2c0912 /drivers/spi/atcspi200_spi.c | |
| parent | 964d4f7211ec85b890e852d0226adba0b4f8c1c9 (diff) | |
| parent | a2569f12f0efaad2b1e0754a19f373275562f91e (diff) | |
| download | u-boot-8ada17dde84954e36d8bc6ff62a6956686eb0ec4.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- Fix a conflict in drivers/spi/atcspi200_spi.c related to the riscv
tree fixing a warning.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/spi/atcspi200_spi.c')
| -rw-r--r-- | drivers/spi/atcspi200_spi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c index be424e0a6f..af96c6d21e 100644 --- a/drivers/spi/atcspi200_spi.c +++ b/drivers/spi/atcspi200_spi.c @@ -229,8 +229,10 @@ static int __atcspi200_spi_xfer(struct nds_spi_slave *ns, __atcspi200_spi_start(ns); break; } - debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n", - *(uint *)data_out, data_out, *(uint *)data_in, data_in, data_len); + if (data_out) + debug("spi_xfer: data_out %08X(%p) data_in %08X(%p) data_len %lu\n", + *(uint *)data_out, data_out, *(uint *)data_in, + data_in, data_len); num_chunks = DIV_ROUND_UP(data_len, max_tran_len); din = data_in; dout = data_out; |