Merge tag 'iommu-fix-v4.11-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

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

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index d9c0decfc91a..36e3f430d265 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -1108,8 +1108,10 @@ error:
 
 static void free_iommu(struct intel_iommu *iommu)
 {
-        iommu_device_sysfs_remove(&iommu->iommu);
-        iommu_device_unregister(&iommu->iommu);
+        if (intel_iommu_enabled) {
+                iommu_device_unregister(&iommu->iommu);
+                iommu_device_sysfs_remove(&iommu->iommu);
+        }
 
         if (iommu->irq) {
                 if (iommu->pr_irq) {