Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afcb0654 authored by Nicolas Palix's avatar Nicolas Palix Committed by Benjamin Herrenschmidt
Browse files

powerpc/powermac: Add missing of_node_put 



This patch fixes some unbalanced OF node references in the
powermac code

Signed-off-by: default avatarNicolas Palix <npalix@diku.dk>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent c1f34302

arch/powerpc/platforms/powermac/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

}



/*

arch/powerpc/platforms/powermac/time.c

+7 −4
Original line number Diff line number Diff line
@@ -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");