commit 51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5
author Linus Torvalds <torvalds@linux-foundation.org> Tue Jan 13 08:17:41 2009 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Jan 13 08:17:41 2009 -0800
tree c34c42989947ef97adb669fb36153951ea2e2f86
parent 288e4877f94a3b144aadc206e7796921d02432c1
parent 4a99d95fa836e254d17910e52663ba2be7b880e7

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_it821x: Update RDC UDMA handling
  ata: fix wrong WARN_ON_ONCE

drivers/pci/intel-iommu.c

diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 235fb7a..3dfecb2 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -438,7 +438,8 @@
 			continue;
 
 		for (i = 0; i < drhd->devices_cnt; i++)
-			if (drhd->devices[i]->bus->number == bus &&
+			if (drhd->devices[i] &&
+			    drhd->devices[i]->bus->number == bus &&
 			    drhd->devices[i]->devfn == devfn)
 				return drhd->iommu;