diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-26 11:13:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-26 11:13:12 +0100 |
| commit | bea8205feeb1d28841541814ae375defb5b1986b (patch) | |
| tree | 0b6c5b5b28e009ba566d033676b1ff9b326fda11 /drivers | |
| parent | c4e85b7e6ff71a130710692fcb8daae5a638941f (diff) | |
| parent | f7aa23cb8dba96b92f46e47101d360c5e0fa4e3b (diff) | |
| download | linux-bea8205feeb1d28841541814ae375defb5b1986b.tar.gz linux-bea8205feeb1d28841541814ae375defb5b1986b.tar.bz2 linux-bea8205feeb1d28841541814ae375defb5b1986b.zip | |
Merge branch 'asoc-fix-ep93xx' into spi-fix-ep93xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-ep93xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c index bb00be8d1851..17a6387e20b5 100644 --- a/drivers/spi/spi-ep93xx.c +++ b/drivers/spi/spi-ep93xx.c @@ -567,7 +567,7 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV); if (IS_ERR(txd)) { ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM); - dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd)); + dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(txd)); msg->status = PTR_ERR(txd); return; } |