diff options
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/chrp/pci.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index a8099c806150..3934c227549b 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, | |||
| 465 | if (parent == NULL) | 465 | if (parent == NULL) |
| 466 | return NULL; | 466 | return NULL; |
| 467 | bus = of_match_bus(parent); | 467 | bus = of_match_bus(parent); |
| 468 | if (strcmp(bus->name, "pci")) | 468 | if (strcmp(bus->name, "pci")) { |
| 469 | of_node_put(parent); | ||
| 469 | return NULL; | 470 | return NULL; |
| 471 | } | ||
| 470 | bus->count_cells(dev, &na, &ns); | 472 | bus->count_cells(dev, &na, &ns); |
| 471 | of_node_put(parent); | 473 | of_node_put(parent); |
| 472 | if (!OF_CHECK_COUNTS(na, ns)) | 474 | if (!OF_CHECK_COUNTS(na, ns)) |
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c index 00c52f27ef4f..8ef279ad36ad 100644 --- a/arch/powerpc/platforms/chrp/pci.c +++ b/arch/powerpc/platforms/chrp/pci.c | |||
| @@ -204,9 +204,11 @@ static void __init setup_peg2(struct pci_controller *hose, struct device_node *d | |||
| 204 | struct device_node *root = find_path_device("/"); | 204 | struct device_node *root = find_path_device("/"); |
| 205 | struct device_node *rtas; | 205 | struct device_node *rtas; |
| 206 | 206 | ||
| 207 | of_node_get(root); | ||
| 207 | rtas = of_find_node_by_name (root, "rtas"); | 208 | rtas = of_find_node_by_name (root, "rtas"); |
| 208 | if (rtas) { | 209 | if (rtas) { |
| 209 | hose->ops = &rtas_pci_ops; | 210 | hose->ops = &rtas_pci_ops; |
| 211 | of_node_put(rtas); | ||
| 210 | } else { | 212 | } else { |
| 211 | printk ("RTAS supporting Pegasos OF not found, please upgrade" | 213 | printk ("RTAS supporting Pegasos OF not found, please upgrade" |
| 212 | " your firmware\n"); | 214 | " your firmware\n"); |
