diff options
Diffstat (limited to 'drivers/dma/imx-dma.c')
-rw-r--r-- | drivers/dma/imx-dma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 3296a7337f25..d3ddcba87f81 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
@@ -41,7 +41,6 @@ struct imxdma_channel { | |||
41 | struct dma_chan chan; | 41 | struct dma_chan chan; |
42 | spinlock_t lock; | 42 | spinlock_t lock; |
43 | struct dma_async_tx_descriptor desc; | 43 | struct dma_async_tx_descriptor desc; |
44 | dma_cookie_t last_completed; | ||
45 | enum dma_status status; | 44 | enum dma_status status; |
46 | int dma_request; | 45 | int dma_request; |
47 | struct scatterlist *sg_list; | 46 | struct scatterlist *sg_list; |
@@ -65,7 +64,7 @@ static void imxdma_handle(struct imxdma_channel *imxdmac) | |||
65 | { | 64 | { |
66 | if (imxdmac->desc.callback) | 65 | if (imxdmac->desc.callback) |
67 | imxdmac->desc.callback(imxdmac->desc.callback_param); | 66 | imxdmac->desc.callback(imxdmac->desc.callback_param); |
68 | imxdmac->last_completed = imxdmac->desc.cookie; | 67 | imxdmac->chan.completed_cookie = imxdmac->desc.cookie; |
69 | } | 68 | } |
70 | 69 | ||
71 | static void imxdma_irq_handler(int channel, void *data) | 70 | static void imxdma_irq_handler(int channel, void *data) |
@@ -158,8 +157,8 @@ static enum dma_status imxdma_tx_status(struct dma_chan *chan, | |||
158 | 157 | ||
159 | last_used = chan->cookie; | 158 | last_used = chan->cookie; |
160 | 159 | ||
161 | ret = dma_async_is_complete(cookie, imxdmac->last_completed, last_used); | 160 | ret = dma_async_is_complete(cookie, chan->completed_cookie, last_used); |
162 | dma_set_tx_state(txstate, imxdmac->last_completed, last_used, 0); | 161 | dma_set_tx_state(txstate, chan->completed_cookie, last_used, 0); |
163 | 162 | ||
164 | return ret; | 163 | return ret; |
165 | } | 164 | } |