staging: speakup: fix leaks of sysfs groups
speakup_kobj_init() and speakup_kobj_exit() didn't remove i18n_attr_group and main_attr_group sysfs groups. Signed-off-by: Vasiliy Kulikov <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
1a88a06871
commit
6a56486716
|
@ -989,24 +989,34 @@ int speakup_kobj_init(void)
|
||||||
|
|
||||||
speakup_kobj = kobject_create_and_add("speakup", accessibility_kobj);
|
speakup_kobj = kobject_create_and_add("speakup", accessibility_kobj);
|
||||||
if (!speakup_kobj) {
|
if (!speakup_kobj) {
|
||||||
kobject_put(accessibility_kobj);
|
retval = -ENOMEM;
|
||||||
return -ENOMEM;
|
goto err_acc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create the files associated with this kobject */
|
/* Create the files associated with this kobject */
|
||||||
retval = sysfs_create_group(speakup_kobj, &main_attr_group);
|
retval = sysfs_create_group(speakup_kobj, &main_attr_group);
|
||||||
if (retval)
|
if (retval)
|
||||||
speakup_kobj_exit();
|
goto err_speakup;
|
||||||
|
|
||||||
retval = sysfs_create_group(speakup_kobj, &i18n_attr_group);
|
retval = sysfs_create_group(speakup_kobj, &i18n_attr_group);
|
||||||
if (retval)
|
if (retval)
|
||||||
speakup_kobj_exit();
|
goto err_group;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
err_group:
|
||||||
|
sysfs_remove_group(speakup_kobj, &main_attr_group);
|
||||||
|
err_speakup:
|
||||||
|
kobject_put(speakup_kobj);
|
||||||
|
err_acc:
|
||||||
|
kobject_put(accessibility_kobj);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
void speakup_kobj_exit(void)
|
void speakup_kobj_exit(void)
|
||||||
{
|
{
|
||||||
|
sysfs_remove_group(speakup_kobj, &i18n_attr_group);
|
||||||
|
sysfs_remove_group(speakup_kobj, &main_attr_group);
|
||||||
kobject_put(speakup_kobj);
|
kobject_put(speakup_kobj);
|
||||||
kobject_put(accessibility_kobj);
|
kobject_put(accessibility_kobj);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue