[<prev] [next>] [day] [month] [year] [list]
Message-ID: <1361925688-12210-1-git-send-email-wenyou.yang@atmel.com>
Date: Wed, 27 Feb 2013 08:41:28 +0800
From: Wenyou Yang <wenyou.yang@...el.com>
To: <linux-arm-kernel@...ts.infradead.org>
CC: <grant.likely@...retlab.ca>, <nicolas.ferre@...el.com>,
<plagnioj@...osoft.com>, <richard.genoud@...il.com>,
<JM.Lin@...el.com>, <wenyou.yang@...el.com>,
<spi-devel-general@...ts.sourceforge.net>,
<linux-kernel@...r.kernel.org>
Subject: [PATCH Resend v5 05/16] spi/spi-atmel: call unmapping on transfers buffers
From: Nicolas Ferre <nicolas.ferre@...el.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@...el.com>
Cc: spi-devel-general@...ts.sourceforge.net
Cc: linux-kernel@...r.kernel.org
[wenyou.yang@...el.com: submit the patch]
Signed-off-by: Wenyou Yang <wenyou.yang@...el.com>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists