Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 321157
b: refs/heads/master
c: c33b644
h: refs/heads/master
i:
  321155: 7345cce
v: v3
  • Loading branch information
Russell King committed Jul 1, 2012
1 parent 33dba2f commit 77f6cb5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ea1605612ca4a8c7936e155da768bb9f4e69e84f
refs/heads/master: c33b644cb31899265ec5102a4ed45c44269dde95
9 changes: 5 additions & 4 deletions trunk/drivers/dma/amba-pl08x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1671,10 +1671,7 @@ static void pl08x_tasklet(unsigned long data)
spin_lock_irqsave(&plchan->lock, flags);
list_splice_tail_init(&plchan->done_list, &head);

/* If a new descriptor is queued, set it up plchan->at is NULL here */
if (!list_empty(&plchan->issued_list)) {
pl08x_start_next_txd(plchan);
} else if (!list_empty(&plchan->pend_list) || plchan->phychan_hold) {
if (plchan->at || !list_empty(&plchan->pend_list) || plchan->phychan_hold) {
/*
* This channel is still in use - we have a new txd being
* prepared and will soon be queued. Don't give up the
Expand Down Expand Up @@ -1786,6 +1783,10 @@ static irqreturn_t pl08x_irq(int irq, void *dev)
pl08x_release_mux(plchan);
dma_cookie_complete(&tx->tx);
list_add_tail(&tx->node, &plchan->done_list);

/* And start the next descriptor */
if (!list_empty(&plchan->issued_list))
pl08x_start_next_txd(plchan);
}
spin_unlock(&plchan->lock);

Expand Down

0 comments on commit 77f6cb5

Please sign in to comment.