aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/smu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-19 09:37:31 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-19 09:37:31 +0200
commitd819c49da624e3ee09b2844603d58265039eecdd (patch)
tree09a503b98769767d81337ec8e5c14c60874a4e77 /drivers/macintosh/smu.c
parentf18f982abf183e91f435990d337164c7a43d1e6d (diff)
parent9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff)
downloadkernel_samsung_crespo-d819c49da624e3ee09b2844603d58265039eecdd.zip
kernel_samsung_crespo-d819c49da624e3ee09b2844603d58265039eecdd.tar.gz
kernel_samsung_crespo-d819c49da624e3ee09b2844603d58265039eecdd.tar.bz2
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'drivers/macintosh/smu.c')
-rw-r--r--drivers/macintosh/smu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 77ad192..d86d57a 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);