diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 20:32:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 20:32:13 -0800 |
| commit | fe69102188cde0700cddd8d4cda0b77d68284884 (patch) | |
| tree | ae2f88c810ff48f040a808a924585000b52082e9 /arch/powerpc/kernel/prom_parse.c | |
| parent | f30ac319f1b91878cdc57a50930f15c36e0e103a (diff) | |
| parent | 7d4d61544a12333600bdb9b018a149868418692e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/prom_parse.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index a8099c80615..3934c227549 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c @@ -465,8 +465,10 @@ u32 *of_get_pci_address(struct device_node *dev, int bar_no, u64 *size, if (parent == NULL) return NULL; bus = of_match_bus(parent); - if (strcmp(bus->name, "pci")) + if (strcmp(bus->name, "pci")) { + of_node_put(parent); return NULL; + } bus->count_cells(dev, &na, &ns); of_node_put(parent); if (!OF_CHECK_COUNTS(na, ns)) |