aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/amba-pl08x.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 986c12775b0b..660165dd945a 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -1540,32 +1540,29 @@ static void pl08x_tasklet(unsigned long data)
1540{ 1540{
1541 struct pl08x_dma_chan *plchan = (struct pl08x_dma_chan *) data; 1541 struct pl08x_dma_chan *plchan = (struct pl08x_dma_chan *) data;
1542 struct pl08x_driver_data *pl08x = plchan->host; 1542 struct pl08x_driver_data *pl08x = plchan->host;
1543 struct pl08x_txd *txd;
1544 dma_async_tx_callback callback = NULL;
1545 void *callback_param = NULL;
1543 unsigned long flags; 1546 unsigned long flags;
1544 1547
1545 spin_lock_irqsave(&plchan->lock, flags); 1548 spin_lock_irqsave(&plchan->lock, flags);
1546 1549
1547 if (plchan->at) { 1550 txd = plchan->at;
1548 dma_async_tx_callback callback = 1551 plchan->at = NULL;
1549 plchan->at->tx.callback;
1550 void *callback_param =
1551 plchan->at->tx.callback_param;
1552 1552
1553 /* 1553 if (txd) {
1554 * Update last completed 1554 callback = txd->tx.callback;
1555 */ 1555 callback_param = txd->tx.callback_param;
1556 plchan->lc = plchan->at->tx.cookie;
1557 1556
1558 /* 1557 /*
1559 * Callback to signal completion 1558 * Update last completed
1560 */ 1559 */
1561 if (callback) 1560 plchan->lc = txd->tx.cookie;
1562 callback(callback_param);
1563 1561
1564 /* 1562 /*
1565 * Free the descriptor 1563 * Free the descriptor
1566 */ 1564 */
1567 pl08x_free_txd(pl08x, plchan->at); 1565 pl08x_free_txd(pl08x, txd);
1568 plchan->at = NULL;
1569 } 1566 }
1570 /* 1567 /*
1571 * If a new descriptor is queued, set it up 1568 * If a new descriptor is queued, set it up
@@ -1616,6 +1613,10 @@ static void pl08x_tasklet(unsigned long data)
1616 } 1613 }
1617 1614
1618 spin_unlock_irqrestore(&plchan->lock, flags); 1615 spin_unlock_irqrestore(&plchan->lock, flags);
1616
1617 /* Callback to signal completion */
1618 if (callback)
1619 callback(callback_param);
1619} 1620}
1620 1621
1621static irqreturn_t pl08x_irq(int irq, void *dev) 1622static irqreturn_t pl08x_irq(int irq, void *dev)