bybrooklyn/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-04-18 06:44:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 'rockchip', 's390', 'core', 'intel/vt-d' and 'amd/amd-vi' into next

Browse Source
This commit is contained in:
Joerg Roedel
2025-03-20 09:11:09 +01:00
parent 4701f33a10 b8741496c0 0a679336dc df90abbc31 dcde1c4aa7 64af12c6ec ba40f9dc95 93ae6e68b6 19e5cc156c
commit 22df63a23a
55 changed files with 1097 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cdx/cdx.c
View File

@@ -360,7 +360,8 @@ static int cdx_dma_configure(struct device *dev)
return ret;
}
if (!ret && !cdx_drv->driver_managed_dma) {
/* @cdx_drv may not be valid when we're called from the IOMMU layer */
if (!ret && dev->driver && !cdx_drv->driver_managed_dma) {
ret = iommu_device_use_default_domain(dev);
if (ret)
arch_teardown_dma_ops(dev);