diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/dma/at_hdmac.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/dma/at_hdmac.c')
| -rw-r--r-- | drivers/dma/at_hdmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index f15112569c1d..efc1a61ca231 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
| @@ -815,7 +815,7 @@ atc_is_tx_complete(struct dma_chan *chan, | |||
| 815 | dev_vdbg(chan2dev(chan), "is_tx_complete: %d (d%d, u%d)\n", | 815 | dev_vdbg(chan2dev(chan), "is_tx_complete: %d (d%d, u%d)\n", |
| 816 | cookie, done ? *done : 0, used ? *used : 0); | 816 | cookie, done ? *done : 0, used ? *used : 0); |
| 817 | 817 | ||
| 818 | spin_lock_bh(atchan->lock); | 818 | spin_lock_bh(&atchan->lock); |
| 819 | 819 | ||
| 820 | last_complete = atchan->completed_cookie; | 820 | last_complete = atchan->completed_cookie; |
| 821 | last_used = chan->cookie; | 821 | last_used = chan->cookie; |
| @@ -830,7 +830,7 @@ atc_is_tx_complete(struct dma_chan *chan, | |||
| 830 | ret = dma_async_is_complete(cookie, last_complete, last_used); | 830 | ret = dma_async_is_complete(cookie, last_complete, last_used); |
| 831 | } | 831 | } |
| 832 | 832 | ||
| 833 | spin_unlock_bh(atchan->lock); | 833 | spin_unlock_bh(&atchan->lock); |
| 834 | 834 | ||
| 835 | if (done) | 835 | if (done) |
| 836 | *done = last_complete; | 836 | *done = last_complete; |