diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-09-06 21:54:24 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-09-06 21:54:24 +0530 |
| commit | dccafbf2d3e3e1f388f6f4a3076ca2ccbeeee487 (patch) | |
| tree | 520f9b3e466b453deeedcdb7e731c3ca5716bd48 /drivers/dma | |
| parent | f6cc35eefe81f332f7428b1d083f08c02a689fa7 (diff) | |
| parent | aa1841b9836f01e3b629368f170f51206a600654 (diff) | |
| download | op-kernel-dev-dccafbf2d3e3e1f388f6f4a3076ca2ccbeeee487.zip op-kernel-dev-dccafbf2d3e3e1f388f6f4a3076ca2ccbeeee487.tar.gz | |
Merge branch 'topic/k3dma' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/k3dma.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c index 01e25c6..01d2a75 100644 --- a/drivers/dma/k3dma.c +++ b/drivers/dma/k3dma.c @@ -223,7 +223,6 @@ static irqreturn_t k3_dma_int_handler(int irq, void *dev_id) if (c && (tc1 & BIT(i))) { spin_lock_irqsave(&c->vc.lock, flags); vchan_cookie_complete(&p->ds_run->vd); - WARN_ON_ONCE(p->ds_done); p->ds_done = p->ds_run; p->ds_run = NULL; spin_unlock_irqrestore(&c->vc.lock, flags); @@ -274,13 +273,14 @@ static int k3_dma_start_txd(struct k3_dma_chan *c) */ list_del(&ds->vd.node); - WARN_ON_ONCE(c->phy->ds_run); - WARN_ON_ONCE(c->phy->ds_done); c->phy->ds_run = ds; + c->phy->ds_done = NULL; /* start dma */ k3_dma_set_desc(c->phy, &ds->desc_hw[0]); return 0; } + c->phy->ds_run = NULL; + c->phy->ds_done = NULL; return -EAGAIN; } @@ -722,11 +722,7 @@ static int k3_dma_terminate_all(struct dma_chan *chan) k3_dma_free_desc(&p->ds_run->vd); p->ds_run = NULL; } - if (p->ds_done) { - k3_dma_free_desc(&p->ds_done->vd); - p->ds_done = NULL; - } - + p->ds_done = NULL; } spin_unlock_irqrestore(&c->vc.lock, flags); vchan_dma_desc_free_list(&c->vc, &head); |
