summaryrefslogtreecommitdiff
path: root/drivers/accel
diff options
context:
space:
mode:
authorThomas Hellström <thomas.hellstrom@linux.intel.com>2024-10-04 11:29:21 +0200
committerThomas Hellström <thomas.hellstrom@linux.intel.com>2024-10-04 11:46:30 +0200
commitb88132ceb3faccdd785809df75f9d490ebaab459 (patch)
treeea383d842f8b5fc4f72ca1ebbd6c02a99754071b /drivers/accel
parent491418a258322bbd7f045e36884d2849b673f23d (diff)
parent9852d85ec9d492ebef56dc5f229416c925758edc (diff)
Merge drm/drm-next into drm-xe-next
Backmerging to resolve a conflict with core locally. Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Diffstat (limited to 'drivers/accel')
-rw-r--r--drivers/accel/qaic/qaic_drv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/accel/qaic/qaic_drv.c b/drivers/accel/qaic/qaic_drv.c
index 580b29ed1902..bf10156c334e 100644
--- a/drivers/accel/qaic/qaic_drv.c
+++ b/drivers/accel/qaic/qaic_drv.c
@@ -447,9 +447,7 @@ static int init_pci(struct qaic_device *qdev, struct pci_dev *pdev)
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
if (ret)
return ret;
- ret = dma_set_max_seg_size(&pdev->dev, UINT_MAX);
- if (ret)
- return ret;
+ dma_set_max_seg_size(&pdev->dev, UINT_MAX);
qdev->bar_0 = devm_ioremap_resource(&pdev->dev, &pdev->resource[0]);
if (IS_ERR(qdev->bar_0))