diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 9e14cf9d875f63abd2ade94f35287319d1ecb27d..a1e56413600a0de8f39e175644bcd28e91de9e1e 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4995,8 +4995,10 @@ static int __init probe_acpi_namespace_devices(void)
 				}
 
 				iommu = device_to_iommu(dev, &bus, &devfn);
-				if (!iommu)
-					return -ENODEV;
+				if (!iommu) {
+					ret = -ENODEV;
+					goto unlock;
+				}
 				info = dmar_search_domain_by_dev_info(iommu->segment, bus, devfn);
 				if (!info) {
 					pn->dev->bus->iommu_ops = &intel_iommu_ops;
@@ -5011,8 +5013,10 @@ static int __init probe_acpi_namespace_devices(void)
 			}
 			if (!pn_dev) {
 				iommu = device_to_iommu(dev, &bus, &devfn);
-				if (!iommu)
-					return -ENODEV;
+				if (!iommu) {
+					ret = -ENODEV;
+					goto unlock;
+				}
 				info = dmar_search_domain_by_dev_info(iommu->segment, bus, devfn);
 				if (!info) {
 					dev->bus->iommu_ops = &intel_iommu_ops;