Merge tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / drivers / char / tlclk.c

diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index ce29e7cce528ec01268f41eb05be4ad7f6dcee3c..e95e0ab0bd870a4c8d679d7dbb092ea2521ee42e 100644 (file)
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -784,8 +784,10 @@ static int __init tlclk_init(void)
        }
        tlclk_major = ret;
        alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL);
-       if (!alarm_events)
+       if (!alarm_events) {
+               ret = -ENOMEM;
                goto out1;
+       }
 
        /* Read telecom clock IRQ number (Set by BIOS) */
        if (!request_region(TLCLK_BASE, 8, "telco_clock")) {