Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

1 files changed, 10 insertions, 7 deletions

diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index f02ccb34604d..443d108211ab 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -1489,25 +1489,28 @@ static struct o2hb_heartbeat_group *to_o2hb_heartbeat_group(struct config_group
                 : NULL;
 }
 
-static struct config_item *o2hb_heartbeat_group_make_item(struct config_group *group,
-                                                          const char *name)
+static int o2hb_heartbeat_group_make_item(struct config_group *group,
+                                          const char *name,
+                                          struct config_item **new_item)
 {
         struct o2hb_region *reg = NULL;
-        struct config_item *ret = NULL;
+        int ret = 0;
 
         reg = kzalloc(sizeof(struct o2hb_region), GFP_KERNEL);
-        if (reg == NULL)
-                goto out; /* ENOMEM */
+        if (reg == NULL) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
         config_item_init_type_name(&reg->hr_item, name, &o2hb_region_type);
 
-        ret = &reg->hr_item;
+        *new_item = &reg->hr_item;
 
         spin_lock(&o2hb_live_lock);
         list_add_tail(&reg->hr_all_item, &o2hb_all_regions);
         spin_unlock(&o2hb_live_lock);
 out:
-        if (ret == NULL)
+        if (ret)
                 kfree(reg);
 
         return ret;