speakup_init() didn't free first_console if speakup_kobj_init() fails.
Also propagate speakup_kobj_init()'s return code.

Signed-off-by: Vasiliy Kulikov <[email protected]>
---
 drivers/staging/speakup/main.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c
index 2ef3b39..b02a61f 100644
--- a/drivers/staging/speakup/main.c
+++ b/drivers/staging/speakup/main.c
@@ -2255,8 +2255,11 @@ static int __init speakup_init(void)
        first_console = kzalloc(sizeof(*first_console), GFP_KERNEL);
        if (!first_console)
                return -ENOMEM;
-       if (speakup_kobj_init() < 0) 
-               return -ENOMEM;
+       err = speakup_kobj_init();
+       if (err) {
+               kfree(first_console);
+               return err;
+       }
 
        reset_default_chars();
        reset_default_chartab();
-- 
1.7.0.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to