diff options
| author | Tom Rini <trini@ti.com> | 2012-10-22 16:54:38 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-22 16:54:38 -0700 |
| commit | c7656bab411433f987baa2288eff8c78ddc0f378 (patch) | |
| tree | 18fe8fa515ecdea19afa83d1af0c6eff4946a5d4 /drivers/spi/fsl_espi.c | |
| parent | bdc3ff6e4f75813d01e51081799d10e4a9c7fbcb (diff) | |
| parent | 23028d69e950023a3cb605751dbcb1e314be8b36 (diff) | |
| download | talos-obmc-uboot-c7656bab411433f987baa2288eff8c78ddc0f378.tar.gz talos-obmc-uboot-c7656bab411433f987baa2288eff8c78ddc0f378.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc85xx
Diffstat (limited to 'drivers/spi/fsl_espi.c')
| -rw-r--r-- | drivers/spi/fsl_espi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/fsl_espi.c b/drivers/spi/fsl_espi.c index a1ebd330d7..eb99e90bec 100644 --- a/drivers/spi/fsl_espi.c +++ b/drivers/spi/fsl_espi.c @@ -216,10 +216,8 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *data_out, return 1; } memcpy(buffer, cmd_buf, cmd_len); - if (cmd_len != 1) { - if (data_in == NULL) - memcpy(buffer + cmd_len, data_out, data_len); - } + if (data_in == NULL) + memcpy(buffer + cmd_len, data_out, data_len); break; case SPI_XFER_BEGIN | SPI_XFER_END: len = data_len; |
