Commit 8e99165a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

Pull minor spi MXS fixes from Mark Brown:
 "These fixes are both pretty minor ones and are driver local."

* tag 'spi-mxs' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc:
  spi: mxs: Terminate DMA in case of DMA timeout
  spi: mxs: Assign message status after transfer finished
parents 065c8012 44968466
...@@ -323,6 +323,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs, ...@@ -323,6 +323,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
if (!ret) { if (!ret) {
dev_err(ssp->dev, "DMA transfer timeout\n"); dev_err(ssp->dev, "DMA transfer timeout\n");
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
dmaengine_terminate_all(ssp->dmach);
goto err_vmalloc; goto err_vmalloc;
} }
...@@ -480,7 +481,7 @@ static int mxs_spi_transfer_one(struct spi_master *master, ...@@ -480,7 +481,7 @@ static int mxs_spi_transfer_one(struct spi_master *master,
first = last = 0; first = last = 0;
} }
m->status = 0; m->status = status;
spi_finalize_current_message(master); spi_finalize_current_message(master);
return status; return status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment