From 80bac18b104c96e4ac9691237a40c8a5745a4aca Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 17 Dec 2007 15:54:39 -0400
Subject: [PATCH] --- yaml --- r: 75800 b: refs/heads/master c:
 d6d292c451e0ffe715fff36dc3a1129868258fa3 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/firmware/efivars.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9199ea062c7e..d064f0a6c918 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd002e807486f9858147c073069a37ba625baad8
+refs/heads/master: d6d292c451e0ffe715fff36dc3a1129868258fa3
diff --git a/trunk/drivers/firmware/efivars.c b/trunk/drivers/firmware/efivars.c
index 7f9f086106cc..b61a72fb6219 100644
--- a/trunk/drivers/firmware/efivars.c
+++ b/trunk/drivers/firmware/efivars.c
@@ -617,16 +617,16 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
 	*(short_name + strlen(short_name)) = '-';
 	efi_guid_unparse(vendor_guid, short_name + strlen(short_name));
 
-	kobject_set_name(&new_efivar->kobj, "%s", short_name);
 	new_efivar->kobj.kset = vars_kset;
-	new_efivar->kobj.ktype = &efivar_ktype;
-	i = kobject_register(&new_efivar->kobj);
+	i = kobject_init_and_add(&new_efivar->kobj, &efivar_ktype, NULL,
+				 "%s", short_name);
 	if (i) {
 		kfree(short_name);
 		kfree(new_efivar);
 		return 1;
 	}
 
+	kobject_uevent(&new_efivar->kobj, KOBJ_ADD);
 	kfree(short_name);
 	short_name = NULL;