diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-30 14:51:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-30 14:51:37 -0400 |
| commit | 8ada17dde84954e36d8bc6ff62a6956686eb0ec4 (patch) | |
| tree | bdcd62c9e31adfed1aed06c0f41cb4719e2c0912 /drivers/spi/fsl_qspi.c | |
| parent | 964d4f7211ec85b890e852d0226adba0b4f8c1c9 (diff) | |
| parent | a2569f12f0efaad2b1e0754a19f373275562f91e (diff) | |
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/fsl_qspi.c')
| -rw-r--r-- | drivers/spi/fsl_qspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 36842494847..197f41f9db0 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -407,7 +407,7 @@ static inline void qspi_ahb_read(struct fsl_qspi_priv *priv, u8 *rxbuf, int len) { struct fsl_qspi_regs *regs = priv->regs; u32 mcr_reg; - void *rx_addr = NULL; + void *rx_addr; mcr_reg = qspi_read32(priv->flags, ®s->mcr); |