diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2005-11-04 12:12:52 +1100 |
|---|---|---|
| committer | Michael Ellerman <michael@ellerman.id.au> | 2005-11-04 12:12:52 +1100 |
| commit | dc3a9efb5ee89493a42c3365d219e339e4720c2b (patch) | |
| tree | a0d261c2933f3083f351c858b01de7677356d4b7 /arch/powerpc/platforms/pseries/iommu.c | |
| parent | 30415f6a63f3383a18e9adf7c144acabe6893f63 (diff) | |
| parent | d3ab57ebdc6457543b346255fa47b0ecd7671136 (diff) | |
Merge with Paulus
Diffstat (limited to 'arch/powerpc/platforms/pseries/iommu.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 9e58a192210..513e2723149 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -499,7 +499,7 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti switch (action) { case PSERIES_RECONFIG_REMOVE: - if (pci->iommu_table && + if (pci && pci->iommu_table && get_property(np, "ibm,dma-window", NULL)) iommu_free_table(np); break; |