From 60ebb387ff48065208d57c4682dfd067bc69f05a Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 17 Oct 2010 18:51:57 +0400 Subject: [PATCH] --- yaml --- r: 220397 b: refs/heads/master c: b3495cebaaa64c9e6df9ab663dfb75e86a08f9ce h: refs/heads/master i: 220395: 39191323d1ca65eb06de81528268fa91b6ec5f0a v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/main.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d145da46a98a..ec9bbbad61c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a56486716d54d2c16c46cde6a5cf10062cd6719 +refs/heads/master: b3495cebaaa64c9e6df9ab663dfb75e86a08f9ce diff --git a/trunk/drivers/staging/speakup/main.c b/trunk/drivers/staging/speakup/main.c index a64704bd19bf..4b7a9c2b965f 100644 --- a/trunk/drivers/staging/speakup/main.c +++ b/trunk/drivers/staging/speakup/main.c @@ -2259,8 +2259,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();