Pull IOMMU fix from Joerg Roedel: "Fix a boot crash caused by the VT-d driver when booted with IOMMU disabled. This was introduced with the recent IOMMU changes" * tag 'iommu-fix-v4.11-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu/vt-d: Fix crash on boot when DMAR is disabled
Unified · Split
| @@ -1108,8 +1108,10 @@ error: · 1107 unmodified lines | |||
| 1108 | 1108 | ||
| 1109 | static void free_iommu(struct intel_iommu *iommu) | 1109 | static void free_iommu(struct intel_iommu *iommu) |
| 1110 | { | 1110 | { |
| 1111 | iommu_device_sysfs_remove(&iommu->iommu); | 1111 | if (intel_iommu_enabled) { |
| 1112 | iommu_device_unregister(&iommu->iommu); | 1112 | iommu_device_unregister(&iommu->iommu); |
| 1113 | iommu_device_sysfs_remove(&iommu->iommu); | ||
| 1114 | } | ||
| 1113 | 1115 | ||
| 1114 | if (iommu->irq) { | 1116 | if (iommu->irq) { |
| 1115 | if (iommu->pr_irq) { | 1117 | if (iommu->pr_irq) { |