From 10a575098e19521fe7d9a843e5235ec057444b2b Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 5 Aug 2012 11:52:35 +0200
Subject: [PATCH] --- yaml --- r: 324320 b: refs/heads/master c:
 e045907c0a08d09cbc992cd00f788ef0dd83889d h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/tlclk.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa9b8429421e..3ac7561bc367 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2323cf77308d6aa13a3a5287310ef93c4919d1e
+refs/heads/master: e045907c0a08d09cbc992cd00f788ef0dd83889d
diff --git a/trunk/drivers/char/tlclk.c b/trunk/drivers/char/tlclk.c
index ce29e7cce528..e95e0ab0bd87 100644
--- a/trunk/drivers/char/tlclk.c
+++ b/trunk/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")) {