spi/spi-atmel: call unmapping on transfers buffers

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 26c126bfe02a13ade8e3d982b6856206b94d6935..3c5ec603bcb0bf15c7aeb639507b38ea63c52d9a 100644 (file)
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1047,6 +1047,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);
@@ -1058,9 +1059,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);
        }