diff options
Diffstat (limited to 'drivers/dma/txx9dmac.c')
-rw-r--r-- | drivers/dma/txx9dmac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c index 6122c364cf11..a917b6723bad 100644 --- a/drivers/dma/txx9dmac.c +++ b/drivers/dma/txx9dmac.c | |||
@@ -424,7 +424,7 @@ txx9dmac_descriptor_complete(struct txx9dmac_chan *dc, | |||
424 | dev_vdbg(chan2dev(&dc->chan), "descriptor %u %p complete\n", | 424 | dev_vdbg(chan2dev(&dc->chan), "descriptor %u %p complete\n", |
425 | txd->cookie, desc); | 425 | txd->cookie, desc); |
426 | 426 | ||
427 | dc->completed = txd->cookie; | 427 | dc->chan.completed_cookie = txd->cookie; |
428 | callback = txd->callback; | 428 | callback = txd->callback; |
429 | param = txd->callback_param; | 429 | param = txd->callback_param; |
430 | 430 | ||
@@ -976,7 +976,7 @@ txx9dmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie, | |||
976 | dma_cookie_t last_complete; | 976 | dma_cookie_t last_complete; |
977 | int ret; | 977 | int ret; |
978 | 978 | ||
979 | last_complete = dc->completed; | 979 | last_complete = chan->completed_cookie; |
980 | last_used = chan->cookie; | 980 | last_used = chan->cookie; |
981 | 981 | ||
982 | ret = dma_async_is_complete(cookie, last_complete, last_used); | 982 | ret = dma_async_is_complete(cookie, last_complete, last_used); |
@@ -985,7 +985,7 @@ txx9dmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie, | |||
985 | txx9dmac_scan_descriptors(dc); | 985 | txx9dmac_scan_descriptors(dc); |
986 | spin_unlock_bh(&dc->lock); | 986 | spin_unlock_bh(&dc->lock); |
987 | 987 | ||
988 | last_complete = dc->completed; | 988 | last_complete = chan->completed_cookie; |
989 | last_used = chan->cookie; | 989 | last_used = chan->cookie; |
990 | 990 | ||
991 | ret = dma_async_is_complete(cookie, last_complete, last_used); | 991 | ret = dma_async_is_complete(cookie, last_complete, last_used); |
@@ -1057,7 +1057,7 @@ static int txx9dmac_alloc_chan_resources(struct dma_chan *chan) | |||
1057 | return -EIO; | 1057 | return -EIO; |
1058 | } | 1058 | } |
1059 | 1059 | ||
1060 | dc->completed = chan->cookie = 1; | 1060 | chan->completed_cookie = chan->cookie = 1; |
1061 | 1061 | ||
1062 | dc->ccr = TXX9_DMA_CCR_IMMCHN | TXX9_DMA_CCR_INTENE | CCR_LE; | 1062 | dc->ccr = TXX9_DMA_CCR_IMMCHN | TXX9_DMA_CCR_INTENE | CCR_LE; |
1063 | txx9dmac_chan_set_SMPCHN(dc); | 1063 | txx9dmac_chan_set_SMPCHN(dc); |
@@ -1186,7 +1186,7 @@ static int __init txx9dmac_chan_probe(struct platform_device *pdev) | |||
1186 | dc->ddev->chan[ch] = dc; | 1186 | dc->ddev->chan[ch] = dc; |
1187 | dc->chan.device = &dc->dma; | 1187 | dc->chan.device = &dc->dma; |
1188 | list_add_tail(&dc->chan.device_node, &dc->chan.device->channels); | 1188 | list_add_tail(&dc->chan.device_node, &dc->chan.device->channels); |
1189 | dc->chan.cookie = dc->completed = 1; | 1189 | dc->chan.cookie = dc->chan.completed_cookie = 1; |
1190 | 1190 | ||
1191 | if (is_dmac64(dc)) | 1191 | if (is_dmac64(dc)) |
1192 | dc->ch_regs = &__txx9dmac_regs(dc->ddev)->CHAN[ch]; | 1192 | dc->ch_regs = &__txx9dmac_regs(dc->ddev)->CHAN[ch]; |