powerpc/powermac: Add missing of_node_put

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>

diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 54b7b76ed4f090242668a145ac8199afac7c80a5..04cdd32624d40b08ffac327f44e9d1124b58e41f 100644 (file)
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -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);
@@ -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);
 }
 
 /*

diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index 59eb840d8ce20782c7cf5809dc46356e2651244c..1810e4226e5615543999e7242a8c467991707907 100644 (file)
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -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");
@@ -297,7 +300,7 @@ int __init via_calibrate_decr(void)
        ppc_tb_freq = (dstart - dend) * 100 / 6;
 
        iounmap(via);
-       
+
        return 1;
 }
 #endif