Merge branch 'linus' into tmp.x86.mpparse.new

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 77ad192962c5..d86d57af282a 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -483,12 +483,15 @@ int __init smu_init (void)
 
         if (smu_cmdbuf_abs == 0) {
                 printk(KERN_ERR "SMU: Command buffer not allocated !\n");
+                of_node_put(np);
                 return -EINVAL;
         }
 
         smu = alloc_bootmem(sizeof(struct smu_device));
-        if (smu == NULL)
+        if (smu == NULL) {
+                of_node_put(np);
                 return -ENOMEM;
+        }
         memset(smu, 0, sizeof(*smu));
 
         spin_lock_init(&smu->lock);