Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'dmaengine-fix-4.11-rc5' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"A couple of minor fixes for 4.11:
- array bound fix for __get_unmap_pool()
- cyclic period splitting for bcm2835"
* tag 'dmaengine-fix-4.11-rc5' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: Fix array index out of bounds warning in __get_unmap_pool()
dmaengine: bcm2835: Fix cyclic DMA period splitting
+6
-1
+4
-1
drivers/dma/bcm2835-dma.c
+4
-1
drivers/dma/bcm2835-dma.c
···
251
251
*/
252
252
253
253
/* have we filled in period_length yet? */
254
-
if (*total_len + control_block->length < period_len)
254
+
if (*total_len + control_block->length < period_len) {
255
+
/* update number of bytes in this period so far */
256
+
*total_len += control_block->length;
255
257
return;
258
+
}
256
259
257
260
/* calculate the length that remains to reach period_length */
258
261
control_block->length = period_len - *total_len;
+2
drivers/dma/dmaengine.c
+2
drivers/dma/dmaengine.c
···
1108
1108
switch (order) {
1109
1109
case 0 ... 1:
1110
1110
return &unmap_pool[0];
1111
+
#if IS_ENABLED(CONFIG_DMA_ENGINE_RAID)
1111
1112
case 2 ... 4:
1112
1113
return &unmap_pool[1];
1113
1114
case 5 ... 7:
1114
1115
return &unmap_pool[2];
1115
1116
case 8:
1116
1117
return &unmap_pool[3];
1118
+
#endif
1117
1119
default:
1118
1120
BUG();
1119
1121
return NULL;