Merge tag 'dmaengine-fix-4.20-rc5' of git://git.infradead.org/users/vkoul/slave-dma (a234c737) · Commits · 戴 / test

Pull dmaengine fixes from Vinod Koul: "This contains two fixes to at_hdmac which fixes long standing bus reported recently on serial transfers causing memory leak. These fixes were done by Richard Genoud" * tag 'dmaengine-fix-4.20-rc5' of git://git.infradead.org/users/vkoul/slave-dma: dmaengine: at_hdmac: fix module unloading dmaengine: at_hdmac: fix memory leak in at_dma_xlate()

drivers/dma/at_hdmac.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -1641,6 +1641,12 @@ static void atc_free_chan_resources(struct dma_chan *chan)
		atchan->descs_allocated = 0;
		atchan->status = 0;

		/*
		* Free atslave allocated in at_dma_xlate()
		*/
		kfree(chan->private);
		chan->private = NULL;

		dev_vdbg(chan2dev(chan), "free_chan_resources: done\n");
		}

		@@ -1675,7 +1681,7 @@ static struct dma_chan at_dma_xlate(struct of_phandle_args dma_spec,
		dma_cap_zero(mask);
		dma_cap_set(DMA_SLAVE, mask);

		atslave = devm_kzalloc(&dmac_pdev->dev, sizeof(*atslave), GFP_KERNEL);
		atslave = kzalloc(sizeof(*atslave), GFP_KERNEL);
		if (!atslave)
		return NULL;

		@@ -2000,6 +2006,8 @@ static int at_dma_remove(struct platform_device *pdev)
		struct resource *io;

		at_dma_off(atdma);
		if (pdev->dev.of_node)
		of_dma_controller_free(pdev->dev.of_node);
		dma_async_device_unregister(&atdma->dma_common);

		dma_pool_destroy(atdma->memset_pool);

Admin message