mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'topic/pl330' into for-linus

This commit is contained in:
Vinod Koul 2018-04-10 08:55:30 +05:30
parent c21bd0a867 a3ca831249
commit f18b46190c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/dma/pl330.c
View File

@ -1510,7 +1510,7 @@ static void pl330_dotask(unsigned long data)
/* Returns 1 if state was updated, 0 otherwise */ /* Returns 1 if state was updated, 0 otherwise */
static int pl330_update(struct pl330_dmac *pl330) static int pl330_update(struct pl330_dmac *pl330)
{ {
struct dma_pl330_desc *descdone, *tmp; struct dma_pl330_desc *descdone;
unsigned long flags; unsigned long flags;
void __iomem *regs; void __iomem *regs;
u32 val; u32 val;
@ -1588,7 +1588,9 @@ static int pl330_update(struct pl330_dmac *pl330)
} }
/* Now that we are in no hurry, do the callbacks */ /* Now that we are in no hurry, do the callbacks */
list_for_each_entry_safe(descdone, tmp, &pl330->req_done, rqd) { while (!list_empty(&pl330->req_done)) {
descdone = list_first_entry(&pl330->req_done,
struct dma_pl330_desc, rqd);
list_del(&descdone->rqd); list_del(&descdone->rqd);
spin_unlock_irqrestore(&pl330->lock, flags); spin_unlock_irqrestore(&pl330->lock, flags);
dma_pl330_rqcb(descdone, PL330_ERR_NONE); dma_pl330_rqcb(descdone, PL330_ERR_NONE);