Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'fpga-for-6.17-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes:
FPGA Manager changes for 6.17-rc1
- Marek's change fixes the incorrect use of sgtable calls.
All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
* tag 'fpga-for-6.17-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
zynq_fpga: use sgtable-based scatterlist wrappers
+2
-2
+2
-2
drivers/fpga/zynq-fpga.c
+2
-2
drivers/fpga/zynq-fpga.c
···
406
406
}
407
407
408
408
priv->dma_nelms =
409
-
dma_map_sg(mgr->dev.parent, sgt->sgl, sgt->nents, DMA_TO_DEVICE);
409
+
dma_map_sgtable(mgr->dev.parent, sgt, DMA_TO_DEVICE, 0);
410
410
if (priv->dma_nelms == 0) {
411
411
dev_err(&mgr->dev, "Unable to DMA map (TO_DEVICE)\n");
412
412
return -ENOMEM;
···
478
478
clk_disable(priv->clk);
479
479
480
480
out_free:
481
-
dma_unmap_sg(mgr->dev.parent, sgt->sgl, sgt->nents, DMA_TO_DEVICE);
481
+
dma_unmap_sgtable(mgr->dev.parent, sgt, DMA_TO_DEVICE, 0);
482
482
return err;
483
483
}
484
484