---

yaml --- r: 142257 b: refs/heads/master c: 4958c5d h: refs/heads/master i: 142255: 807e84a v: v3
git-mirror · Apr 6, 2009 · 3074765 · 3074765
1 parent e387552
commit 3074765
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 276dbf997043cbf38f0087624e0f9c51742c8885
+refs/heads/master: 4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
@@ -485,7 +485,8 @@ static struct intel_iommu *device_to_iommu(int segment, u8 bus, u8 devfn)
 			    drhd->devices[i]->bus->number == bus &&
 			    drhd->devices[i]->devfn == devfn)
 				return drhd->iommu;
-			if (drhd->devices[i]->subordinate &&
+			if (drhd->devices[i] &&
+			    drhd->devices[i]->subordinate &&
 			    drhd->devices[i]->subordinate->number <= bus &&
 			    drhd->devices[i]->subordinate->subordinate >= bus)
 				return drhd->iommu;