[PATCH Resend v5 05/16] spi/spi-atmel: call unmapping on transfers buffers
From: Wenyou Yang <hidden>
Date: 2013-02-27 00:43:57
Also in:
linux-spi, lkml
Subsystem:
microchip spi driver, spi subsystem, the rest · Maintainers:
Ryan Wanner, Mark Brown, Linus Torvalds
From: Nicolas Ferre <redacted> Signed-off-by: Nicolas Ferre <redacted> Cc: spi-devel-general at lists.sourceforge.net Cc: linux-kernel at vger.kernel.org [wenyou.yang at atmel.com: submit the patch] Signed-off-by: Wenyou Yang <redacted> --- drivers/spi/spi-atmel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index c70142e..6ea41a7 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c@@ -1059,6 +1059,7 @@ static int atmel_spi_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct atmel_spi *as = spi_master_get_devdata(master); struct spi_message *msg; + struct spi_transfer *xfer; /* reset the hardware and block queue progress */ spin_lock_irq(&as->lock);
@@ -1070,9 +1071,10 @@ static int atmel_spi_remove(struct platform_device *pdev) /* Terminate remaining queued transfers */ list_for_each_entry(msg, &as->queue, queue) { - /* REVISIT unmapping the dma is a NOP on ARM and AVR32 - * but we shouldn't depend on that... - */ + list_for_each_entry(xfer, &msg->transfers, transfer_list) { + if (!msg->is_dma_mapped) + atmel_spi_dma_unmap_xfer(master, xfer); + } msg->status = -ESHUTDOWN; msg->complete(msg->context); }
--
1.7.9.5