From 05703926d530e84a69ab0400b454eb10ecc6584e Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Tue, 26 Oct 2010 17:35:14 +0000 Subject: [PATCH] --- yaml --- r: 229339 b: refs/heads/master c: f4133236d6473072b5982c1182991eade6ff5bae h: refs/heads/master i: 229337: 085dd2f27a68ce702d2a256fd6aa6a5490911581 229335: c90de76cffa549205bcf6bbfeed0f58ecc6c0f13 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/iommu.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4609eb421650..91276ffbafc1 100644 --- 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 index 0dbadbb34f3a..dae3f8847117 100644 --- 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;