From d07bec5bbd6ed341fd61216d4a378b1b1ec719f5 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 20 Sep 2012 18:57:51 +0000
Subject: [PATCH] --- yaml --- r: 323057 b: refs/heads/master c:
 a9e8d1a6b87167116e5779378f1d25ffed2e833b h: refs/heads/master i:   323055:
 64d706302ca9a3ae2b5052bf281d9398f5b634a0 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc/kernel/module.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index df711395ecd2..d4cd1330f4c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfa520af2c20aa3c75f0497d49165561212a1c6f
+refs/heads/master: a9e8d1a6b87167116e5779378f1d25ffed2e833b
diff --git a/trunk/arch/sparc/kernel/module.c b/trunk/arch/sparc/kernel/module.c
index bae6ab600b7f..f1ddc0d23679 100644
--- a/trunk/arch/sparc/kernel/module.c
+++ b/trunk/arch/sparc/kernel/module.c
@@ -48,9 +48,7 @@ void *module_alloc(unsigned long size)
 		return NULL;
 
 	ret = module_map(size);
-	if (!ret)
-		ret = ERR_PTR(-ENOMEM);
-	else
+	if (ret)
 		memset(ret, 0, size);
 
 	return ret;