From 30747652b4a0ff5941cf34eb17cdce507f85bfa8 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 6 Apr 2009 13:30:01 -0700
Subject: [PATCH] --- yaml --- r: 142257 b: refs/heads/master c:
 4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e h: refs/heads/master i:   142255:
 807e84a310ca78c836d0c6930c52b3aa3bca09cc v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/pci/intel-iommu.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 98f9faa8dc1b..5af60b587baa 100644
--- 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
index fd7472f28674..dcda5212f3bb 100644
--- 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;