Skip to content

Commit

Permalink
powerpc/powermac: Add missing of_node_put
Browse files Browse the repository at this point in the history
This patch fixes some unbalanced OF node references in the
powermac code

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Nicolas Palix authored and Benjamin Herrenschmidt committed Jan 8, 2009
1 parent c1f3430 commit afcb065
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions arch/powerpc/platforms/powermac/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ static void __init init_second_ohare(void)
pci_find_hose_for_OF_device(np);
if (!hose) {
printk(KERN_ERR "Can't find PCI hose for OHare2 !\n");
of_node_put(np);
return;
}
early_read_config_word(hose, bus, devfn, PCI_COMMAND, &cmd);
Expand All @@ -669,6 +670,7 @@ static void __init init_second_ohare(void)
early_write_config_word(hose, bus, devfn, PCI_COMMAND, cmd);
}
has_second_ohare = 1;
of_node_put(np);
}

/*
Expand Down
11 changes: 7 additions & 4 deletions arch/powerpc/platforms/powermac/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,15 @@ int __init via_calibrate_decr(void)
struct resource rsrc;

vias = of_find_node_by_name(NULL, "via-cuda");
if (vias == 0)
if (vias == NULL)
vias = of_find_node_by_name(NULL, "via-pmu");
if (vias == 0)
if (vias == NULL)
vias = of_find_node_by_name(NULL, "via");
if (vias == 0 || of_address_to_resource(vias, 0, &rsrc))
if (vias == NULL || of_address_to_resource(vias, 0, &rsrc)) {
of_node_put(vias);
return 0;
}
of_node_put(vias);
via = ioremap(rsrc.start, rsrc.end - rsrc.start + 1);
if (via == NULL) {
printk(KERN_ERR "Failed to map VIA for timer calibration !\n");
Expand All @@ -297,7 +300,7 @@ int __init via_calibrate_decr(void)
ppc_tb_freq = (dstart - dend) * 100 / 6;

iounmap(via);

return 1;
}
#endif
Expand Down

0 comments on commit afcb065

Please sign in to comment.