git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipcomp: Avoid duplicate calls to ipcomp_destroy
[safe/jmp/linux-2.6]
/
drivers
/
firmware
/
efivars.c
diff --git
a/drivers/firmware/efivars.c
b/drivers/firmware/efivars.c
index
7f9f086
..
f4f709d
100644
(file)
--- a/
drivers/firmware/efivars.c
+++ b/
drivers/firmware/efivars.c
@@
-397,7
+397,7
@@
static struct kobj_type efivar_ktype = {
static inline void
efivar_unregister(struct efivar_entry *var)
{
static inline void
efivar_unregister(struct efivar_entry *var)
{
- kobject_
unregister
(&var->kobj);
+ kobject_
put
(&var->kobj);
}
}
@@
-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));
*(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.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;
}
if (i) {
kfree(short_name);
kfree(new_efivar);
return 1;
}
+ kobject_uevent(&new_efivar->kobj, KOBJ_ADD);
kfree(short_name);
short_name = NULL;
kfree(short_name);
short_name = NULL;
@@
-732,7
+732,7
@@
efivars_init(void)
kset_unregister(vars_kset);
out_firmware_unregister:
kset_unregister(vars_kset);
out_firmware_unregister:
- kobject_
unregister
(efi_kobj);
+ kobject_
put
(efi_kobj);
out_free:
kfree(variable_name);
out_free:
kfree(variable_name);
@@
-753,7
+753,7
@@
efivars_exit(void)
}
kset_unregister(vars_kset);
}
kset_unregister(vars_kset);
- kobject_
unregister
(efi_kobj);
+ kobject_
put
(efi_kobj);
}
module_init(efivars_init);
}
module_init(efivars_init);