projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[deliverable/linux.git]
/
drivers
/
dma
/
sun6i-dma.c
diff --git
a/drivers/dma/sun6i-dma.c
b/drivers/dma/sun6i-dma.c
index 5065ca43facede040f92a2ac64fa35c147675fe3..3835fcde35456fb20e89e77d5b02644b98df4df8 100644
(file)
--- a/
drivers/dma/sun6i-dma.c
+++ b/
drivers/dma/sun6i-dma.c
@@
-865,7
+865,7
@@
static enum dma_status sun6i_dma_tx_status(struct dma_chan *chan,
size_t bytes = 0;
ret = dma_cookie_status(chan, cookie, state);
- if (ret == DMA_COMPLETE)
+ if (ret == DMA_COMPLETE
|| !state
)
return ret;
spin_lock_irqsave(&vchan->vc.lock, flags);
This page took
0.03787 seconds
and
5
git commands to generate.