Skip to content

Commit 29d9d09

Browse files
committed
fixup! iommu: Fix breakage when second IOMMU defers probe
1 parent 91446e3 commit 29d9d09

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

drivers/iommu/iommu.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2926,6 +2926,12 @@ int iommu_fwspec_of_xlate(struct iommu_fwspec *fwspec, struct device *dev,
29262926
int ret;
29272927

29282928
ret = iommu_fwspec_assign_iommu(fwspec, dev, iommu_fwnode);
2929+
if (ret == -EPROBE_DEFER) {
2930+
mutex_lock(&iommu_probe_device_lock);
2931+
if (dev->iommu)
2932+
dev_iommu_free(dev);
2933+
mutex_unlock(&iommu_probe_device_lock);
2934+
}
29292935
if (ret)
29302936
return ret;
29312937

0 commit comments

Comments
 (0)