Commit 2c3bac60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'edac_urgent_for_v6.17_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull EDAC fix from Borislav Petkov:

 - Remove a misplaced dma_free_coherent() call in altera_edac

* tag 'edac_urgent_for_v6.17_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/altera: Delete an inappropriate dma_free_coherent() call
parents 6ab41fca ff2a66d2

drivers/edac/altera_edac.c

+0 −1
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ static ssize_t altr_sdr_mc_err_inject_write(struct file *file, 


	ptemp = dma_alloc_coherent(mci->pdev, 16, &dma_handle, GFP_KERNEL);

	if (!ptemp) {

		dma_free_coherent(mci->pdev, 16, ptemp, dma_handle);

		edac_printk(KERN_ERR, EDAC_MC,

			    "Inject: Buffer Allocation error\n");

		return -ENOMEM;