UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: speakup: fix failure handling 

fix the failure handling in kobjects and the main function so that we
release the virtual keyboard if we exit due to another failure.

Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
William Hubbs 2010-12-16 13:26:58 -06:00 committed by Greg Kroah-Hartman
parent 7571f089d7
commit 7959d55679
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/speakup/kobjects.c
View File

@ -984,8 +984,10 @@ int speakup_kobj_init(void)
* not known ahead of time. * not known ahead of time.
*/ */
accessibility_kobj = kobject_create_and_add("accessibility", NULL); accessibility_kobj = kobject_create_and_add("accessibility", NULL);
if (!accessibility_kobj) if (!accessibility_kobj) {
return -ENOMEM; retval = -ENOMEM;
goto out;
}
speakup_kobj = kobject_create_and_add("speakup", accessibility_kobj); speakup_kobj = kobject_create_and_add("speakup", accessibility_kobj);
if (!speakup_kobj) { if (!speakup_kobj) {
@ -1002,7 +1004,7 @@ int speakup_kobj_init(void)
if (retval) if (retval)
goto err_group; goto err_group;
return 0; goto out;
err_group: err_group:
sysfs_remove_group(speakup_kobj, &main_attr_group); sysfs_remove_group(speakup_kobj, &main_attr_group);
@ -1010,6 +1012,7 @@ err_speakup:
kobject_put(speakup_kobj); kobject_put(speakup_kobj);
err_acc: err_acc:
kobject_put(accessibility_kobj); kobject_put(accessibility_kobj);
out:
return retval; return retval;
} }

33
drivers/staging/speakup/main.c
View File

@ -2253,17 +2253,17 @@ static int __init speakup_init(void)
err = speakup_add_virtual_keyboard(); err = speakup_add_virtual_keyboard();
if (err) if (err)
return err; goto out;
initialize_msgs(); /* Initialize arrays for i18n. */ initialize_msgs(); /* Initialize arrays for i18n. */
first_console = kzalloc(sizeof(*first_console), GFP_KERNEL); first_console = kzalloc(sizeof(*first_console), GFP_KERNEL);
if (!first_console) if (!first_console) {
return -ENOMEM; err = -ENOMEM;
err = speakup_kobj_init(); goto err_cons;
if (err) {
kfree(first_console);
return err;
} }
err = speakup_kobj_init();
if (err)
goto err_kobject;
reset_default_chars(); reset_default_chars();
reset_default_chartab(); reset_default_chartab();
@ -2299,11 +2299,20 @@ static int __init speakup_init(void)
speakup_task = kthread_create(speakup_thread, NULL, "speakup"); speakup_task = kthread_create(speakup_thread, NULL, "speakup");
set_user_nice(speakup_task, 10); set_user_nice(speakup_task, 10);
if (!IS_ERR(speakup_task)) if (IS_ERR(speakup_task)) {
wake_up_process(speakup_task); err = -ENOMEM;
else goto err_kobject;
return -ENOMEM; }
return 0; wake_up_process(speakup_task);
goto out;
err_kobject:
speakup_kobj_exit();
kfree(first_console);
err_cons:
speakup_remove_virtual_keyboard();
out:
return err;
} }
module_init(speakup_init); module_init(speakup_init);