diff options
| author | Mark Brown <broonie@kernel.org> | 2015-05-08 12:48:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-08 12:48:27 +0100 |
| commit | 7d769802427ef9a91eaf9b5a9a6283e71f2ba9d8 (patch) | |
| tree | 9aba92472f2242e8d31e0b9dff7887f026ccd99e /drivers/spi | |
| parent | b787f68c36d49bb1d9236f403813641efa74a031 (diff) | |
| parent | c5a06e75f38376238db6a38240bac4b27dfe5216 (diff) | |
Merge remote-tracking branch 'spi/fix/omap2-mcspi' into spi-omap2-mcspi
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 4df8942058de..d1a5b9fc3eba 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -1210,6 +1210,7 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, struct omap2_mcspi *mcspi; struct omap2_mcspi_dma *mcspi_dma; struct spi_transfer *t; + int status; spi = m->spi; mcspi = spi_master_get_devdata(master); @@ -1229,7 +1230,8 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, tx_buf ? "tx" : "", rx_buf ? "rx" : "", t->bits_per_word); - return -EINVAL; + status = -EINVAL; + goto out; } if (m->is_dma_mapped || len < DMA_MIN_BYTES) @@ -1241,7 +1243,8 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, if (dma_mapping_error(mcspi->dev, t->tx_dma)) { dev_dbg(mcspi->dev, "dma %cX %d bytes error\n", 'T', len); - return -EINVAL; + status = -EINVAL; + goto out; } } if (mcspi_dma->dma_rx && rx_buf != NULL) { @@ -1253,14 +1256,19 @@ static int omap2_mcspi_transfer_one_message(struct spi_master *master, if (tx_buf != NULL) dma_unmap_single(mcspi->dev, t->tx_dma, len, DMA_TO_DEVICE); - return -EINVAL; + status = -EINVAL; + goto out; } } } omap2_mcspi_work(mcspi, m); + /* spi_finalize_current_message() changes the status inside the + * spi_message, save the status here. */ + status = m->status; +out: spi_finalize_current_message(master); - return 0; + return status; } static int omap2_mcspi_master_setup(struct omap2_mcspi *mcspi) |