summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-04-06 13:30:01 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-04-06 13:30:01 -0700
commit4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e (patch)
tree7bad2dac396fef6cca7f72132078a30e912b2589 /drivers/pci
parent276dbf997043cbf38f0087624e0f9c51742c8885 (diff)
downloadop-kernel-dev-4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e.zip
op-kernel-dev-4958c5dc7bcb2e42d985cd26aeafd8a7eca9ab1e.tar.gz
intel-iommu: Fix oops in device_to_iommu() when devices not found.
It's possible for a device in the drhd->devices[] array to be NULL if it wasn't found at boot time, which means we have to check for that case. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/intel-iommu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index fd7472f..dcda521 100644
--- a/drivers/pci/intel-iommu.c
+++ b/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;
OpenPOWER on IntegriCloud