Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'dmaengine-fix-4.19-rc4' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fix from Vinod Koul:
"Fix the mic_x100_dma driver to use devm_kzalloc for driver memory, so
that it is freed properly when it unregisters from dmaengine using
managed API"
* tag 'dmaengine-fix-4.19-rc4' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: mic_x100_dma: use devm_kzalloc to fix an issue
+1
-3
+1
-3
drivers/dma/mic_x100_dma.c
+1
-3
drivers/dma/mic_x100_dma.c
···
639
639
int ret;
640
640
struct device *dev = &mbdev->dev;
641
641
642
-
mic_dma_dev = kzalloc(sizeof(*mic_dma_dev), GFP_KERNEL);
642
+
mic_dma_dev = devm_kzalloc(dev, sizeof(*mic_dma_dev), GFP_KERNEL);
643
643
if (!mic_dma_dev) {
644
644
ret = -ENOMEM;
645
645
goto alloc_error;
···
664
664
reg_error:
665
665
mic_dma_uninit(mic_dma_dev);
666
666
init_error:
667
-
kfree(mic_dma_dev);
668
667
mic_dma_dev = NULL;
669
668
alloc_error:
670
669
dev_err(dev, "Error at %s %d ret=%d\n", __func__, __LINE__, ret);
···
673
674
static void mic_dma_dev_unreg(struct mic_dma_device *mic_dma_dev)
674
675
{
675
676
mic_dma_uninit(mic_dma_dev);
676
-
kfree(mic_dma_dev);
677
677
}
678
678
679
679
/* DEBUGFS CODE */