git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-fixes-2017-04-27' of git://anongit.freedesktop.org/git...
[sfrench/cifs-2.6.git]
/
drivers
/
dma
/
bcm2835-dma.c
diff --git
a/drivers/dma/bcm2835-dma.c
b/drivers/dma/bcm2835-dma.c
index e18dc596cf2447fa9ef7e41b62d9396e29043426..6204cc32d09c5096df8aec304c3c37b3bcb6be44 100644
(file)
--- a/
drivers/dma/bcm2835-dma.c
+++ b/
drivers/dma/bcm2835-dma.c
@@
-251,8
+251,11
@@
static void bcm2835_dma_create_cb_set_length(
*/
/* have we filled in period_length yet? */
*/
/* have we filled in period_length yet? */
- if (*total_len + control_block->length < period_len)
+ if (*total_len + control_block->length < period_len) {
+ /* update number of bytes in this period so far */
+ *total_len += control_block->length;
return;
return;
+ }
/* calculate the length that remains to reach period_length */
control_block->length = period_len - *total_len;
/* calculate the length that remains to reach period_length */
control_block->length = period_len - *total_len;