diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-01 17:03:59 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-02 17:08:25 +1100 |
| commit | 59b608c2c33feacc8be281ec3ba9ca2a3a5cb9a7 (patch) | |
| tree | 7fa81c83037fbd69f6b4c2014cc69bdc7f9bdbf2 /arch | |
| parent | 309ea626b164f2abba8e639b3eb6f2e5d34708b9 (diff) | |
| download | op-kernel-dev-59b608c2c33feacc8be281ec3ba9ca2a3a5cb9a7.zip op-kernel-dev-59b608c2c33feacc8be281ec3ba9ca2a3a5cb9a7.tar.gz | |
powerpc: Fix oops on some machines due to incorrect pr_debug()
Recently, a patch left DEBUG enabled in the powerpc common PCI code,
resulting in an old bug in a pr_debug() statement to show up and cause
a NULL dereference on some machines.
This fixes the pr_debug() statement and reverts to DEBUG not being
force-enabled in that file.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index da5a385..19b12d2 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -16,8 +16,6 @@ * 2 of the License, or (at your option) any later version. */ -#define DEBUG - #include <linux/kernel.h> #include <linux/pci.h> #include <linux/string.h> @@ -258,7 +256,8 @@ int pci_read_irq_line(struct pci_dev *pci_dev) } else { pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n", oirq.size, oirq.specifier[0], oirq.specifier[1], - oirq.controller->full_name); + oirq.controller ? oirq.controller->full_name : + "<default>"); virq = irq_create_of_mapping(oirq.controller, oirq.specifier, oirq.size); |
