Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
dma
/
pl330.c
diff --git
a/kernel/drivers/dma/pl330.c
b/kernel/drivers/dma/pl330.c
index
340f9e6
..
3dabc52
100644
(file)
--- a/
kernel/drivers/dma/pl330.c
+++ b/
kernel/drivers/dma/pl330.c
@@
-2328,7
+2328,7
@@
static dma_cookie_t pl330_tx_submit(struct dma_async_tx_descriptor *tx)
desc->txd.callback = last->txd.callback;
desc->txd.callback_param = last->txd.callback_param;
}
desc->txd.callback = last->txd.callback;
desc->txd.callback_param = last->txd.callback_param;
}
-
last
->last = false;
+
desc
->last = false;
dma_cookie_assign(&desc->txd);
dma_cookie_assign(&desc->txd);
@@
-2621,6
+2621,7
@@
pl330_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dst,
desc->rqcfg.brst_len = 1;
desc->rqcfg.brst_len = get_burst_len(desc, len);
desc->rqcfg.brst_len = 1;
desc->rqcfg.brst_len = get_burst_len(desc, len);
+ desc->bytes_requested = len;
desc->txd.flags = flags;
desc->txd.flags = flags;