---

yaml --- r: 229339 b: refs/heads/master c: f413323 h: refs/heads/master i: 229337: 085dd2f 229335: c90de76 v: v3
git-mirror · Dec 9, 2010 · 0570392 · 0570392
1 parent 703c99a
commit 0570392
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7372cfb88f71ed975c8588d1ca5ecc8bb9ec7c7b
+refs/heads/master: f4133236d6473072b5982c1182991eade6ff5bae
diff --git a/trunk/arch/powerpc/platforms/pseries/iommu.c b/trunk/arch/powerpc/platforms/pseries/iommu.c
@@ -530,10 +530,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
 	}
 	pr_debug("  parent is %s\n", pdn->full_name);
 
-	/* Check for parent == NULL so we don't try to setup the empty EADS
-	 * slots on POWER4 machines.
-	 */
-	if (dma_window == NULL || pdn->parent == NULL) {
+	if (dma_window == NULL) {
 		pr_debug("  no dma window for device, linking to parent\n");
 		set_iommu_table_base(&dev->dev, PCI_DN(pdn)->iommu_table);
 		return;