Skip to content

backport: dma-mapping: don't return errors from dma_set_max_seg_size #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vicamo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

backport: dma-mapping: don't return errors from dma_set_max_seg_size #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions drivers/media/pci/intel/ipu7/ipu7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <linux/scatterlist.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/version.h>
#include <linux/vmalloc.h>
#include <media/ipu-bridge.h>

Expand Down Expand Up @@ -1795,9 +1796,13 @@ static int ipu7_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (ret)
return dev_err_probe(dev, ret, "Failed to set DMA mask\n");

#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
ret = dma_set_max_seg_size(dev, UINT_MAX);
if (ret)
return dev_err_probe(dev, ret, "Failed to set max_seg_size\n");
#else
dma_set_max_seg_size(dev, UINT_MAX);
#endif

ret = ipu7_pci_config_setup(pdev);
if (ret)
Expand Down