Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Here is the late fixes pull request for dmaengine while you fly back
from KS.
We have a new dmaengine ML hosted by vger so a patch for that along
with addition of Dave as driver mainatainer for ioat. Other fixes are
memeory leak fixes on edma driver, small fixes on rcar-hpbdma driver
by Sergei"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: edma: fix another memory leak
dma: edma: Fix memory leak
MAINTAINERS: add to ioatdma maintainer list
MAINTAINERS: add the new dmaengine mailing list
+8
-1
+6
-1
MAINTAINERS
+6
-1
MAINTAINERS
···
2728
2728
DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
2729
2729
M: Vinod Koul <vinod.koul@intel.com>
2730
2730
M: Dan Williams <dan.j.williams@intel.com>
2731
+
L: dmaengine@vger.kernel.org
2732
+
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
2731
2733
S: Supported
2732
2734
F: drivers/dma/
2733
2735
F: include/linux/dma*
···
4369
4367
4370
4368
INTEL I/OAT DMA DRIVER
4371
4369
M: Dan Williams <dan.j.williams@intel.com>
4372
-
S: Maintained
4370
+
M: Dave Jiang <dave.jiang@intel.com>
4371
+
L: dmaengine@vger.kernel.org
4372
+
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
4373
+
S: Supported
4373
4374
F: drivers/dma/ioat*
4374
4375
4375
4376
INTEL IOMMU (VT-d)
+2
drivers/dma/edma.c
+2
drivers/dma/edma.c
···
305
305
edma_alloc_slot(EDMA_CTLR(echan->ch_num),
306
306
EDMA_SLOT_ANY);
307
307
if (echan->slot[i] < 0) {
308
+
kfree(edesc);
308
309
dev_err(dev, "Failed to allocate slot\n");
309
310
kfree(edesc);
310
311
return NULL;
···
347
346
ccnt = sg_dma_len(sg) / (acnt * bcnt);
348
347
if (ccnt > (SZ_64K - 1)) {
349
348
dev_err(dev, "Exceeded max SG segment size\n");
349
+
kfree(edesc);
350
350
return NULL;
351
351
}
352
352
cidx = acnt * bcnt;