Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (53 commits)
  serial: Add driver for the Cell Network Processor serial port NWP device
  powerpc: enable dynamic ftrace
  powerpc/cell: Fix the prototype of create_vma_map()
  powerpc/mm: Make clear_fixmap() actually work
  powerpc/kdump: Use ppc_save_regs() in crash_setup_regs()
  powerpc: Export cacheable_memzero as its now used in a driver
  powerpc: Fix missing semicolons in mmu_decl.h
  powerpc/pasemi: local_irq_save uses an unsigned long
  powerpc/cell: Fix some u64 vs. long types
  powerpc/cell: Use correct types in beat files
  powerpc: Use correct type in prom_init.c
  powerpc: Remove unnecessary casts
  mtd/ps3vram: Use _PAGE_NO_CACHE in memory ioremap
  mtd/ps3vram: Use msleep in waits
  mtd/ps3vram: Use proper kernel types
  mtd/ps3vram: Cleanup ps3vram driver messages
  mtd/ps3vram: Remove ps3vram debug routines
  mtd/ps3vram: Add modalias support to the ps3vram driver
  mtd/ps3vram: Add ps3vram driver for accessing video RAM as MTD
  powerpc: Fix iseries drivers build failure without CONFIG_VIOPATH
  ...

2 files changed, 9 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 54b7b76ed4f0..04cdd32624d4 100644
--- 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 59eb840d8ce2..1810e4226e56 100644
--- 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