[PATCH 1/2] dma: pl08x: fix descriptor unmapping

[Linus Walleij]

The descriptor unmapping code introduced in commit
d38a8c622a1b3 "dmaengine: prepare for generic 'unmap' data"
accidentally affects a local struct rather than the
async TX descriptor, resulting in this compile error:

  CC      drivers/dma/amba-pl08x.o
drivers/dma/amba-pl08x.c: In function âpl08x_desc_freeâ:
drivers/dma/amba-pl08x.c:1172:2: warning: passing argument 1 of
âdma_descriptor_unmapâ from incompatible pointer type [enabled by default]
In file included from linux/include/linux/amba/pl08x.h:21:0,
                 from linux/drivers/dma/amba-pl08x.c:79:
linux/include/linux/dmaengine.h:476:20: note: expected
âstruct dma_async_tx_descriptor *â but argument is of type âstruct pl08x_txd *â

Cc: stable@xxxxxxxxxxxxxxx
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Alban Bedel <alban.bedel@xxxxxxxxxxxxxxxxx>
Cc: Tomasz Figa <tomasz.figa@xxxxxxxxx>
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
---
 drivers/dma/amba-pl08x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 16a2aa28f856..ec4ee5c1fe9d 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1169,7 +1169,7 @@ static void pl08x_desc_free(struct virt_dma_desc *vd)
 	struct pl08x_txd *txd = to_pl08x_txd(&vd->tx);
 	struct pl08x_dma_chan *plchan = to_pl08x_chan(vd->tx.chan);
 
-	dma_descriptor_unmap(txd);
+	dma_descriptor_unmap(&vd->tx);
 	if (!txd->done)
 		pl08x_release_mux(plchan);
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/