diff options
| author | John Rose <johnrose@austin.ibm.com> | 2005-11-02 10:29:55 -0600 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-03 16:53:49 +1100 |
| commit | 8902e87f1fc72740a40686a31ca07e6c2cf1f0f2 (patch) | |
| tree | 17d6fa17cbf41c5eda3d79696e77f9a69fa0b51a /arch/powerpc | |
| parent | f4fcbbe9a7fdf11305fea657202b954bdc2228ec (diff) | |
[PATCH] ppc64: Fix add notifier crashes
The extraction of PCI stuff from struct device_node left some false
assumptions in notifier code. As a result, dynamic add crashes when
non-PCI nodes are added. This patch fixes these assumptions.
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -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 9e90d41131d8..a73faafaac8c 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -498,7 +498,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; |