Merge tag 'mvebu-cleanup-4.6-2' of git://git.infradead.org/linux-mvebu into next/cleanup

809683ee · Arnd Bergmann <[email protected]> · 2016-02-29 23:53:01 +01:00

Merge "mvebu cleanup for 4.6 (part 2)" from Gregory CLEMENT:

Add a missing call to of_node_put() armada_xp_smp_prepare_cpus()

* tag 'mvebu-cleanup-4.6-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add missing of_node_put()

Commit: 809683ee060de5ea45294d465dc242dee1ff189f
Parents: b8d56b61 · 7d8f9ac1

Merge commit. Changes below are compared with the first parent: b8d56b61.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/arm/mach-mvebu/platsmp.c	modified	+1	−0	View file

arch/arm/mach-mvebu/platsmp.c

View file

diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index f9597b7..46c742d 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -140,6 +140,7 @@ static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
 		panic("Cannot find 'marvell,bootrom' compatible node");
 
 	err = of_address_to_resource(node, 0, &res);
+	of_node_put(node);
 	if (err < 0)
 		panic("Cannot get 'bootrom' node address");
 